bk commit into 5.1 tree (hartmut:1.2339) BUG#23772

['Hartmut Holzgraefe']

Below is the list of changes that have just been committed into a local
5.1 repository of hartmut. When hartmut 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-10-30 15:27:12+01:00, hartmut@stripped +13 -0
  fixed %s / LEX_STRING uses (Bug #23772)

  server-tools/instance-manager/guardian.cc@stripped, 2006-10-30 15:26:59+01:00,
hartmut@stripped +5 -5
    fixed %s / LEX_STRING uses (Bug #23772)

  server-tools/instance-manager/instance.cc@stripped, 2006-10-30 15:26:59+01:00,
hartmut@stripped +3 -3
    fixed %s / LEX_STRING uses (Bug #23772)

  server-tools/instance-manager/instance_options.cc@stripped, 2006-10-30 15:26:59+01:00,
hartmut@stripped +1 -1
    fixed %s / LEX_STRING uses (Bug #23772)

  sql/event_scheduler.cc@stripped, 2006-10-30 15:26:59+01:00, hartmut@stripped +2 -2
    fixed %s / LEX_STRING uses (Bug #23772)

  sql/ha_ndbcluster.cc@stripped, 2006-10-30 15:27:00+01:00, hartmut@stripped +1 -1
    fixed %s / LEX_STRING uses (Bug #23772)

  sql/handler.cc@stripped, 2006-10-30 15:27:00+01:00, hartmut@stripped +1 -1
    fixed %s / LEX_STRING uses (Bug #23772)

  sql/log.cc@stripped, 2006-10-30 15:27:00+01:00, hartmut@stripped +1 -1
    fixed %s / LEX_STRING uses (Bug #23772)

  sql/sql_parse.cc@stripped, 2006-10-30 15:27:00+01:00, hartmut@stripped +1 -1
    fixed %s / LEX_STRING uses (Bug #23772)

  sql/sql_plugin.cc@stripped, 2006-10-30 15:27:00+01:00, hartmut@stripped +2 -2
    fixed %s / LEX_STRING uses (Bug #23772)

  sql/sql_select.cc@stripped, 2006-10-30 15:27:01+01:00, hartmut@stripped +1 -1
    fixed %s / LEX_STRING uses (Bug #23772)

  sql/table.cc@stripped, 2006-10-30 15:27:01+01:00, hartmut@stripped +1 -1
    fixed %s / LEX_STRING uses (Bug #23772)

  storage/federated/ha_federated.cc@stripped, 2006-10-30 15:27:02+01:00, hartmut@stripped +1
-1
    fixed %s / LEX_STRING uses (Bug #23772)

  storage/myisam/ha_myisam.cc@stripped, 2006-10-30 15:27:02+01:00, hartmut@stripped +5 -5
    fixed %s / LEX_STRING uses (Bug #23772)

# 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:	hartmut
# Host:	linux.site
# Root:	/home/hartmut/projects/mysql/dev/5.1-maint

--- 1.199/storage/myisam/ha_myisam.cc	2006-10-30 15:27:22 +01:00
+++ 1.200/storage/myisam/ha_myisam.cc	2006-10-30 15:27:22 +01:00
@@ -609,7 +609,7 @@
     {
       param.testflag&= ~T_RETRY_WITHOUT_QUICK;
       sql_print_information("Retrying repair of: '%s' without quick",
-                            table->s->path);
+                            table->s->path.str);
       continue;
     }
     param.testflag&= ~T_QUICK;
@@ -617,7 +617,7 @@
     {
       param.testflag= (param.testflag & ~T_REP_BY_SORT) | T_REP;
       sql_print_information("Retrying repair of: '%s' with keycache",
-                            table->s->path);
+                            table->s->path.str);
       continue;
     }
     break;
@@ -629,7 +629,7 @@
     sql_print_information("Found %s of %s rows when repairing '%s'",
                           llstr(file->state->records, llbuff),
                           llstr(start_records, llbuff2),
-                          table->s->path);
+                          table->s->path.str);
   }
   return error;
 }
@@ -1157,7 +1157,7 @@
   // Don't use quick if deleted rows
   if (!file->state->del && (myisam_recover_options & HA_RECOVER_QUICK))
     check_opt.flags|=T_QUICK;
-  sql_print_warning("Checking table:   '%s'",table->s->path);
+  sql_print_warning("Checking table:   '%s'",table->s->path.str);
 
   old_query= thd->query;
   old_query_length= thd->query_length;
@@ -1168,7 +1168,7 @@
 
   if ((marked_crashed= mi_is_crashed(file)) || check(thd, &check_opt))
   {
-    sql_print_warning("Recovering table: '%s'",table->s->path);
+    sql_print_warning("Recovering table: '%s'",table->s->path.str);
     check_opt.flags=
       ((myisam_recover_options & HA_RECOVER_BACKUP ? T_BACKUP_DATA : 0) |
        (marked_crashed                             ? 0 : T_QUICK) |

--- 1.277/sql/handler.cc	2006-10-30 15:27:22 +01:00
+++ 1.278/sql/handler.cc	2006-10-30 15:27:22 +01:00
@@ -3547,7 +3547,7 @@
              ++table_ptr)
         {
           TABLE *const table= *table_ptr;
-          DBUG_PRINT("info", ("Checking table %s", table->s->table_name));
+          DBUG_PRINT("info", ("Checking table %s", table->s->table_name.str));
           if (table->current_lock == F_WRLCK &&
               check_table_binlog_row_based(thd, table))
           {

--- 1.240/sql/log.cc	2006-10-30 15:27:22 +01:00
+++ 1.241/sql/log.cc	2006-10-30 15:27:22 +01:00
@@ -3366,7 +3366,7 @@
   int error;
   DBUG_ENTER("THD::binlog_write_table_map");
   DBUG_PRINT("enter", ("table: %0xlx  (%s: #%u)",
-                       (long) table, table->s->table_name,
+                       (long) table, table->s->table_name.str,
                        table->s->table_map_id));
 
   /* Pre-conditions */

--- 1.591/sql/sql_parse.cc	2006-10-30 15:27:22 +01:00
+++ 1.592/sql/sql_parse.cc	2006-10-30 15:27:22 +01:00
@@ -1604,7 +1604,7 @@
       command= COM_END;				// Wrong command
     DBUG_PRINT("info",("Command on %s = %d (%s)",
 		       vio_description(net->vio), command,
-		       command_name[command]));
+		       command_name[command].str));
   }
   net->read_timeout=old_timeout;		// restore it
   /*

--- 1.460/sql/sql_select.cc	2006-10-30 15:27:22 +01:00
+++ 1.461/sql/sql_select.cc	2006-10-30 15:27:22 +01:00
@@ -10687,7 +10687,7 @@
   */
   if (error != HA_ERR_LOCK_DEADLOCK && error != HA_ERR_LOCK_WAIT_TIMEOUT)
     sql_print_error("Got error %d when reading table '%s'",
-		    error, table->s->path);
+		    error, table->s->path.str);
   table->file->print_error(error,MYF(0));
   return 1;
 }

--- 1.249/sql/table.cc	2006-10-30 15:27:22 +01:00
+++ 1.250/sql/table.cc	2006-10-30 15:27:23 +01:00
@@ -480,7 +480,7 @@
       sql_print_warning("'%s' had no or invalid character set, "
                         "and default character set is multi-byte, "
                         "so character column sizes may have changed",
-                        share->path);
+                        share->path.str);
     }
     share->table_charset= default_charset_info;
   }

--- 1.29/sql/event_scheduler.cc	2006-10-30 15:27:23 +01:00
+++ 1.30/sql/event_scheduler.cc	2006-10-30 15:27:23 +01:00
@@ -378,7 +378,7 @@
   DBUG_ENTER("Event_scheduler::start");
 
   LOCK_DATA();
-  DBUG_PRINT("info", ("state before action %s", scheduler_states_names[state]));
+  DBUG_PRINT("info", ("state before action %s", scheduler_states_names[state].str));
   if (state > INITIALIZED)
     goto end;
 
@@ -584,7 +584,7 @@
   DBUG_PRINT("enter", ("thd=%p", current_thd));
 
   LOCK_DATA();
-  DBUG_PRINT("info", ("state before action %s", scheduler_states_names[state]));
+  DBUG_PRINT("info", ("state before action %s", scheduler_states_names[state].str));
   if (state != RUNNING)
     goto end;
 

--- 1.362/sql/ha_ndbcluster.cc	2006-10-30 15:27:23 +01:00
+++ 1.363/sql/ha_ndbcluster.cc	2006-10-30 15:27:23 +01:00
@@ -5091,7 +5091,7 @@
 {
   DBUG_ENTER("ha_ndbcluster::add_index");
   DBUG_PRINT("info", ("ha_ndbcluster::add_index to table %s", 
-                      table_arg->s->table_name));
+                      table_arg->s->table_name.str));
   int error= 0;
   uint idx;
 

--- 1.36/sql/sql_plugin.cc	2006-10-30 15:27:23 +01:00
+++ 1.37/sql/sql_plugin.cc	2006-10-30 15:27:23 +01:00
@@ -502,7 +502,7 @@
     if ((*plugin_type_deinitialize[plugin->plugin->type])(plugin))
     {
       sql_print_error("Plugin '%s' of type %s failed deinitialization",
-                      plugin->name.str,
plugin_type_names[plugin->plugin->type]);
+                      plugin->name.str,
plugin_type_names[plugin->plugin->type].str);
     } 
   }
   else if (plugin->plugin->deinit)
@@ -562,7 +562,7 @@
     if ((*plugin_type_initialize[plugin->plugin->type])(plugin))
     {
       sql_print_error("Plugin '%s' registration as a %s failed.",
-                      plugin->name.str,
plugin_type_names[plugin->plugin->type]);
+                      plugin->name.str,
plugin_type_names[plugin->plugin->type].str);
       goto err;
     }
   }

--- 1.84/storage/federated/ha_federated.cc	2006-10-30 15:27:23 +01:00
+++ 1.85/storage/federated/ha_federated.cc	2006-10-30 15:27:23 +01:00
@@ -2156,7 +2156,7 @@
 int ha_federated::index_init(uint keynr, bool sorted)
 {
   DBUG_ENTER("ha_federated::index_init");
-  DBUG_PRINT("info", ("table: '%s'  key: %u", table->s->table_name, keynr));
+  DBUG_PRINT("info", ("table: '%s'  key: %u", table->s->table_name.str, keynr));
   active_index= keynr;
   DBUG_RETURN(0);
 }

--- 1.25/server-tools/instance-manager/guardian.cc	2006-10-30 15:27:23 +01:00
+++ 1.26/server-tools/instance-manager/guardian.cc	2006-10-30 15:27:23 +01:00
@@ -158,7 +158,7 @@
     {
       /* clear status fields */
       log_info("guardian: instance %s is running, set state to STARTED",
-               instance->options.instance_name);
+               instance->options.instance_name.str);
       current_node->restart_counter= 0;
       current_node->crash_moment= 0;
       current_node->state= STARTED;
@@ -169,7 +169,7 @@
     switch (current_node->state) {
     case NOT_STARTED:
       log_info("guardian: starting instance %s",
-               instance->options.instance_name);
+               instance->options.instance_name.str);
 
       /* NOTE, set state to STARTING _before_ start() is called */
       current_node->state= STARTING;
@@ -194,7 +194,7 @@
         {
           instance->start();
           log_info("guardian: starting instance %s",
-                   instance->options.instance_name);
+                   instance->options.instance_name.str);
         }
       }
       else
@@ -212,13 +212,13 @@
             current_node->last_checked= current_time;
             current_node->restart_counter++;
             log_info("guardian: restarting instance %s",
-                     instance->options.instance_name);
+                     instance->options.instance_name.str);
           }
         }
         else
         {
           log_info("guardian: cannot start instance %s. Abandoning attempts "
-                   "to (re)start it", instance->options.instance_name);
+                   "to (re)start it", instance->options.instance_name.str);
           current_node->state= CRASHED_AND_ABANDONED;
         }
       }

--- 1.38/server-tools/instance-manager/instance.cc	2006-10-30 15:27:23 +01:00
+++ 1.39/server-tools/instance-manager/instance.cc	2006-10-30 15:27:23 +01:00
@@ -166,7 +166,7 @@
     exit(1);
   case -1:
     log_info("cannot create a new process to start instance %s",
-             instance_options->instance_name);
+             instance_options->instance_name.str);
     return 1;
   }
   return 0;
@@ -313,7 +313,7 @@
     if (options.unlink_pidfile())             /* remove stalled pidfile */
       log_error("cannot remove pidfile for instance %i, this might be \
                 since IM lacks permmissions or hasn't found the pidifle",
-                options.instance_name);
+                options.instance_name.str);
 }
 
 
@@ -619,7 +619,7 @@
         log_error("The instance %s is being stopped forcibly. Normally" \
                   "it should not happen. Probably the instance has been" \
                   "hanging. You should also check your IM setup",
-                  options.instance_name);
+                  options.instance_name.str);
         /* After sucessful hard kill the pidfile need to be removed */
         options.unlink_pidfile();
       }

--- 1.37/server-tools/instance-manager/instance_options.cc	2006-10-30 15:27:23 +01:00
+++ 1.38/server-tools/instance-manager/instance_options.cc	2006-10-30 15:27:23 +01:00
@@ -182,7 +182,7 @@
 err:
   if (rc)
     log_error("fill_instance_version: Failed to get version of '%s'",
-              mysqld_path);
+              mysqld_path.str);
   return rc;
 }