bk commit into 5.1 tree (anozdrin:1.2343)

[Alexander Nozdrin]

Below is the list of changes that have just been committed into a local
5.1 repository of alik. When alik does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-11-07 23:34:32+03:00, anozdrin@alik. +2 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.1
  into  alik.:/mnt/raid/alik/MySQL/devel/5.1-merged
  MERGE: 1.2334.3.6

  sql/handler.cc@stripped, 2006-11-07 23:34:28+03:00, anozdrin@alik. +0 -0
    Auto merged
    MERGE: 1.273.1.6

  sql/mysqld.cc@stripped, 2006-11-07 23:34:28+03:00, anozdrin@alik. +0 -0
    Auto merged
    MERGE: 1.583.1.4

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	anozdrin
# Host:	alik.
# Root:	/mnt/raid/alik/MySQL/devel/5.1-merged/RESYNC

--- 1.277/sql/handler.cc	2006-11-07 23:34:37 +03:00
+++ 1.278/sql/handler.cc	2006-11-07 23:34:37 +03:00
@@ -2951,15 +2951,15 @@ static my_bool binlog_func_list(THD *thd
 
 static my_bool binlog_func_foreach(THD *thd, binlog_func_st *bfn)
 {
-  handlerton *hton;
   hton_list_st hton_list;
+  uint i, sz;
+
   hton_list.sz= 0;
   plugin_foreach(thd, binlog_func_list,
                  MYSQL_STORAGE_ENGINE_PLUGIN, &hton_list);
 
-  uint i= 0, sz= hton_list.sz;
-  while(i < sz)
-    hton_list.hton[i++]->binlog_func(hton, thd, bfn->fn, bfn->arg);
+  for (i= 0, sz= hton_list.sz; i < sz ; i++)
+    hton_list.hton[i]->binlog_func(hton_list.hton[i], thd, bfn->fn, bfn->arg);
   return FALSE;
 }
 

--- 1.588/sql/mysqld.cc	2006-11-07 23:34:37 +03:00
+++ 1.589/sql/mysqld.cc	2006-11-07 23:34:37 +03:00
@@ -1183,6 +1183,7 @@ void clean_up(bool print_message)
   hostname_cache_free();
   item_user_lock_free();
   lex_free();				/* Free some memory */
+  item_create_cleanup();
   set_var_free();
   free_charsets();
   if (!opt_noacl)
@@ -1608,7 +1609,7 @@ static void network_init(void)
 
     if (strlen(mysqld_unix_port) > (sizeof(UNIXaddr.sun_path) - 1))
     {
-      sql_print_error("The socket file path is too long (> %lu): %s",
+      sql_print_error("The socket file path is too long (> %u): %s",
                       sizeof(UNIXaddr.sun_path) - 1, mysqld_unix_port);
       unireg_abort(1);
     }
@@ -2716,6 +2717,8 @@ static int init_common_variables(const c
     return 1;
   init_client_errs();
   lex_init();
+  if (item_create_init())
+    return 1;
   item_init();
   set_var_init();
   mysys_uses_curses=0;
@@ -3529,7 +3532,7 @@ int main(int argc, char **argv)
     {
       if (global_system_variables.log_warnings)
 	sql_print_warning("Asked for %ld thread stack, but got %ld",
-			  thread_stack, stack_size);
+			  thread_stack, (long) stack_size);
 #if defined(__ia64__) || defined(__ia64)
       thread_stack= stack_size*2;
 #else
@@ -5338,7 +5341,7 @@ master-ssl",
    (gptr*) &locked_in_memory, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
   {"merge", OPT_MERGE, "Enable Merge storage engine. Disable with \
 --skip-merge.",
-   (gptr*) &opt_merge, (gptr*) &opt_merge, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0},
+   (gptr*) &opt_merge, (gptr*) &opt_merge, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0},
   {"myisam-recover", OPT_MYISAM_RECOVER,
    "Syntax: myisam-recover[=option[,option...]], where option can be DEFAULT, BACKUP, FORCE or QUICK.",
    (gptr*) &myisam_recover_options_str, (gptr*) &myisam_recover_options_str, 0,