Merge bk-internal.mysql.com:/home/bk/mysql-5.1

into  mysql.com:/home/my/mysql-5.1


configure.in:
  Auto merged
client/mysql.cc:
  Auto merged
include/m_ctype.h:
  Auto merged
sql/field.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_string.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
storage/myisam/mi_rkey.c:
  Auto merged
client/mysqldump.c:
  Manual merge (trivial)
scripts/mysql_install_db.sh:
  Complex merge (parital rewrite of new code)
sql/sql_show.cc:
  Manual merge
tests/mysql_client_test.c:
  then
    if ! test -x "$print_defaults"
    then
      missing_in_basedir my_print_defaults
      exit 1
    fi
  else

2 files changed, 20 insertions, 21 deletions

diff --git a/tests/bug25714.c b/tests/bug25714.c
index e9b2be44209..4782178e2f2 100644
--- a/tests/bug25714.c
+++ b/tests/bug25714.c
@@ -68,4 +68,5 @@ int main (int argc, char **argv)
   my_end(0);
 
   return 0;
-};
+}
+
diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c
index 3656364820e..0b23f1ab9d4 100644
--- a/tests/mysql_client_test.c
+++ b/tests/mysql_client_test.c
@@ -2419,7 +2419,7 @@ static uint query_cache_hits(MYSQL *conn)
 */
 static void test_ps_query_cache()
 {
-  MYSQL      *org_mysql= mysql, *lmysql;
+  MYSQL      *lmysql;
   MYSQL_STMT *stmt;
   int        rc;
   MYSQL_BIND p_bind[2],r_bind[2]; /* p: param bind; r: result bind */
@@ -2563,8 +2563,7 @@ static void test_ps_query_cache()
     check_execute(stmt, rc);
     test_ps_query_cache_result(1, "hh", 2, 2, "hh", 2, 1, "ii", 2);
     hits2= query_cache_hits(mysql);
-    switch(iteration)
-    {
+    switch(iteration) {
     case TEST_QCACHE_ON_WITH_OTHER_CONN:
     case TEST_QCACHE_ON:                 /* should have hit */
       DIE_UNLESS(hits2-hits1 == 1);
@@ -2572,6 +2571,7 @@ static void test_ps_query_cache()
     case TEST_QCACHE_OFF_ON:
     case TEST_QCACHE_ON_OFF:             /* should not have hit */
       DIE_UNLESS(hits2-hits1 == 0);
+      break;
     }
 
     /* now modify parameter values and see qcache hits */
@@ -2582,8 +2582,7 @@ static void test_ps_query_cache()
     test_ps_query_cache_result(1, "hh", 2, 1, "ii", 2, 2, "ii", 2);
     hits1= query_cache_hits(mysql);
 
-    switch(iteration)
-    {
+    switch(iteration) {
     case TEST_QCACHE_ON:
     case TEST_QCACHE_OFF_ON:
     case TEST_QCACHE_ON_OFF:             /* should not have hit */
@@ -2591,6 +2590,7 @@ static void test_ps_query_cache()
       break;
     case TEST_QCACHE_ON_WITH_OTHER_CONN: /* should have hit */
       DIE_UNLESS(hits1-hits2 == 1);
+      break;
     }
 
     rc= mysql_stmt_execute(stmt);
@@ -2601,8 +2601,7 @@ static void test_ps_query_cache()
 
     mysql_stmt_close(stmt);
 
-    switch(iteration)
-    {
+    switch(iteration) {
     case TEST_QCACHE_ON:                 /* should have hit */
       DIE_UNLESS(hits2-hits1 == 1);
       break;
@@ -2613,8 +2612,6 @@ static void test_ps_query_cache()
     case TEST_QCACHE_ON_WITH_OTHER_CONN: /* should have hit */
       DIE_UNLESS(hits2-hits1 == 1);
       break;
-      mysql_close(lmysql);
-      mysql= org_mysql;
     }
 
   } /* for(iteration=...) */
@@ -12296,24 +12293,24 @@ static void test_bug6081()
   int rc;
   myheader("test_bug6081");
 
-  rc= simple_command(mysql, COM_DROP_DB, current_db,
+  rc= simple_command(mysql, COM_DROP_DB, (uchar*) current_db,
                      (ulong)strlen(current_db), 0);
   if (rc == 0 && mysql_errno(mysql) != ER_UNKNOWN_COM_ERROR)
   {
     myerror(NULL);                                   /* purecov: inspected */
     die(__FILE__, __LINE__, "COM_DROP_DB failed");   /* purecov: inspected */
   }
-  rc= simple_command(mysql, COM_DROP_DB, current_db,
+  rc= simple_command(mysql, COM_DROP_DB, (uchar*) current_db,
                      (ulong)strlen(current_db), 0);
   myquery_r(rc);
-  rc= simple_command(mysql, COM_CREATE_DB, current_db,
+  rc= simple_command(mysql, COM_CREATE_DB, (uchar*) current_db,
                      (ulong)strlen(current_db), 0);
   if (rc == 0 && mysql_errno(mysql) != ER_UNKNOWN_COM_ERROR)
   {
     myerror(NULL);                                   /* purecov: inspected */
     die(__FILE__, __LINE__, "COM_CREATE_DB failed"); /* purecov: inspected */
   }
-  rc= simple_command(mysql, COM_CREATE_DB, current_db,
+  rc= simple_command(mysql, COM_CREATE_DB, (uchar*) current_db,
                      (ulong)strlen(current_db), 0);
   myquery_r(rc);
   rc= mysql_select_db(mysql, current_db);
@@ -13540,7 +13537,8 @@ static void test_bug9478()
       /* Fill in the fethc packet */
       int4store(buff, stmt->stmt_id);
       buff[4]= 1;                               /* prefetch rows */
-      rc= ((*mysql->methods->advanced_command)(mysql, COM_STMT_FETCH, buff,
+      rc= ((*mysql->methods->advanced_command)(mysql, COM_STMT_FETCH,
+                                               (uchar*) buff,
                                                sizeof(buff), 0,0,1,NULL) ||
            (*mysql->methods->read_query_result)(mysql));
       DIE_UNLESS(rc);
@@ -16105,7 +16103,7 @@ static void test_bug27876()
   int rc;
   MYSQL_RES *result;
 
-  unsigned char utf8_func[] =
+  uchar utf8_func[] =
   {
     0xd1, 0x84, 0xd1, 0x83, 0xd0, 0xbd, 0xd0, 0xba,
     0xd1, 0x86, 0xd0, 0xb8, 0xd0, 0xb9, 0xd0, 0xba,
@@ -16113,7 +16111,7 @@ static void test_bug27876()
     0x00
   };
 
-  unsigned char utf8_param[] =
+  uchar utf8_param[] =
   {
     0xd0, 0xbf, 0xd0, 0xb0, 0xd1, 0x80, 0xd0, 0xb0,
     0xd0, 0xbc, 0xd0, 0xb5, 0xd1, 0x82, 0xd1, 0x8a,
@@ -16135,23 +16133,23 @@ static void test_bug27876()
   result= mysql_store_result(mysql);
   mytest(result);
 
-  sprintf(query, "DROP FUNCTION IF EXISTS %s", utf8_func);
+  sprintf(query, "DROP FUNCTION IF EXISTS %s", (char*) utf8_func);
   rc= mysql_query(mysql, query);
   myquery(rc);
 
   sprintf(query,
           "CREATE FUNCTION %s( %s VARCHAR(25))"
           " RETURNS VARCHAR(25) DETERMINISTIC RETURN %s",
-          utf8_func, utf8_param, utf8_param);
+          (char*) utf8_func, (char*) utf8_param, (char*) utf8_param);
   rc= mysql_query(mysql, query);
   myquery(rc);
-  sprintf(query, "SELECT %s(VERSION())", utf8_func);
+  sprintf(query, "SELECT %s(VERSION())", (char*) utf8_func);
   rc= mysql_query(mysql, query);
   myquery(rc);
   result= mysql_store_result(mysql);
   mytest(result);
 
-  sprintf(query, "DROP FUNCTION %s", utf8_func);
+  sprintf(query, "DROP FUNCTION %s", (char*) utf8_func);
   rc= mysql_query(mysql, query);
   myquery(rc);