After merge fixes.

Note that mix_innodb_myisam_binlog and union fails after this patch (Will be fixed shortly by maintaners of this code)


client/mysql.cc:
  After merge fix
include/mysql.h:
  Some additions to MYSQL_BIND for cleaner prepared statement code
libmysql/libmysql.c:
  mysql_prepare_result -> mysql_get_metadata()
  Added test for offset overflow when using mysql_fetch_column()
  Cleaned up mysql_fetch_column()
  Optimized fetch_result() usage
mysql-test/r/func_group.result:
  Updated results after merge
mysql-test/r/func_test.result:
  Updated results after merge
mysql-test/r/grant.result:
  Updated results after merge
mysql-test/r/loaddata.result:
  Updated results after merge
mysql-test/r/lowercase_table.result:
  Updated results after merge
mysql-test/r/mix_innodb_myisam_binlog.result:
  Updated results after merge (note that this is still not correct; Need patch to mysqld to fix this properly)
mysql-test/r/myisam.result:
  Updated results after merge
mysql-test/r/range.result:
  Updated results after merge
mysql-test/r/rpl_loaddata.result:
  Updated results after merge
mysql-test/r/rpl_loaddata_rule_m.result:
  Updated results after merge
mysql-test/r/rpl_loaddata_rule_s.result:
  Updated results after merge
mysql-test/r/rpl_log.result:
  Updated results after merge
mysql-test/r/union.result:
  Updated results after merge
mysql-test/t/lowercase_table.test:
  Update after merge
mysql-test/t/myisam.test:
  Update after merge
mysql-test/t/union.test:
  Update after merge
sql-bench/compare-results.sh:
  Fix for now output format
sql/field.h:
  Added is_null_in_record() to make ha_innodb.cc code more general
sql/ha_innodb.cc:
  Removed some functions that uses inernal (private) MySQL information
sql/item_cmpfunc.cc:
  After merge fix
sql/log_event.cc:
  After merge fix; (Some code should be checked by Guilhem)
sql/opt_range.cc:
  Simple optimzation and after merge fixes
sql/slave.cc:
  After merge fix
sql/sql_acl.cc:
  After merge fix + code cleanup
sql/sql_select.cc:
  After merge fix
sql/sql_show.cc:
  After merge fix
sql/sql_table.cc:
  After merge fix
  Cleanup of mysql_checksum_table()
sql/sql_union.cc:
  After merge fixes.
  Note that after this the union test still fails; Will be fixed shortly...
tests/client_test.c:
  mysql_prepare_result() -> mysql_get_metadata()

1 files changed, 12 insertions, 13 deletions

diff --git a/tests/client_test.c b/tests/client_test.c
index 46a272f2acb..2cbea7e27bc 100644
--- a/tests/client_test.c
+++ b/tests/client_test.c
@@ -412,7 +412,7 @@ uint my_process_stmt_result(MYSQL_STMT *stmt)
   my_bool     is_null[MAX_RES_FIELDS];
   int         rc, i;
 
-  if (!(result= mysql_prepare_result(stmt))) /* No meta info */
+  if (!(result= mysql_get_metadata(stmt))) /* No meta info */
   {
     while (!mysql_fetch(stmt)) 
       row_count++;
@@ -1017,7 +1017,7 @@ static void test_prepare_field_result()
 
   verify_param_count(stmt,1);
 
-  result = mysql_prepare_result(stmt);
+  result = mysql_get_metadata(stmt);
   mytest(result);
   
   my_print_result_metadata(result);
@@ -1765,7 +1765,6 @@ static void test_bug1115()
   MYSQL_BIND bind[1];
   ulong length[1];
   char szData[11];
-  int nData=1;
 
   myheader("test_bug1115");
 
@@ -3728,7 +3727,7 @@ static void test_prepare_resultset()
 
   verify_param_count(stmt,0);
 
-  result = mysql_prepare_result(stmt);
+  result = mysql_get_metadata(stmt);
   mytest(result);
   my_print_result_metadata(result);
   mysql_stmt_close(stmt);
@@ -5926,7 +5925,7 @@ static void test_field_misc()
   rc = mysql_execute(stmt);
   mystmt(stmt,rc);
 
-  result = mysql_prepare_result(stmt);
+  result = mysql_get_metadata(stmt);
   mytest(result);
   
   myassert(1 == my_process_stmt_result(stmt));
@@ -5967,7 +5966,7 @@ static void test_field_misc()
   stmt = mysql_prepare(mysql, "SELECT @@table_type", 30);
   mystmt_init(stmt);
 
-  result = mysql_prepare_result(stmt);
+  result = mysql_get_metadata(stmt);
   mytest(result);
 
   rc = mysql_execute(stmt);
@@ -5987,7 +5986,7 @@ static void test_field_misc()
   stmt = mysql_prepare(mysql, "SELECT @@max_error_count", 30);
   mystmt_init(stmt);
 
-  result = mysql_prepare_result(stmt);
+  result = mysql_get_metadata(stmt);
   mytest(result);
 
   rc = mysql_execute(stmt);
@@ -6007,7 +6006,7 @@ static void test_field_misc()
   stmt = mysql_prepare(mysql, "SELECT @@max_allowed_packet", 30);
   mystmt_init(stmt);
 
-  result = mysql_prepare_result(stmt);
+  result = mysql_get_metadata(stmt);
   mytest(result);
 
   rc = mysql_execute(stmt);
@@ -6027,7 +6026,7 @@ static void test_field_misc()
   stmt = mysql_prepare(mysql, "SELECT @@sql_warnings", 30);
   mystmt_init(stmt);
   
-  result = mysql_prepare_result(stmt);
+  result = mysql_get_metadata(stmt);
   mytest(result);
 
   rc = mysql_execute(stmt);
@@ -6418,7 +6417,7 @@ static void test_explain_bug()
 
   myassert( 2 == my_process_stmt_result(stmt));  
 
-  result = mysql_prepare_result(stmt);
+  result = mysql_get_metadata(stmt);
   mytest(result);
 
   fprintf(stdout, "\n total fields in the result: %d", 
@@ -6454,7 +6453,7 @@ static void test_explain_bug()
 
   myassert( 1 == my_process_stmt_result(stmt)); 
 
-  result = mysql_prepare_result(stmt);
+  result = mysql_get_metadata(stmt);
   mytest(result);
 
   fprintf(stdout, "\n total fields in the result: %d", 
@@ -7255,7 +7254,7 @@ static void test_mem_overun()
   rc = mysql_execute(stmt);
   mystmt(stmt,rc); 
   
-  field_res = mysql_prepare_result(stmt);
+  field_res = mysql_get_metadata(stmt);
   mytest(field_res);
 
   fprintf(stdout,"\n total fields : %d", mysql_num_fields(field_res));
@@ -7611,7 +7610,7 @@ static void test_ts()
   stmt = mysql_prepare(mysql,"SELECT * FROM test_ts",50);
   mystmt_init(stmt);
 
-  prep_res = mysql_prepare_result(stmt);
+  prep_res = mysql_get_metadata(stmt);
   mytest(prep_res);
 
   rc = mysql_execute(stmt);