Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0

into mysql.com:/home/cps/mysql/trees/mysql-5.0

server-tools/instance-manager/commands.cc

@@ -294,13 +294,19 @@ int Show_instance_options::do_command(struct st_net *net,
       char *tmp_option, *option_value;
       get_dynamic(&(instance->options.options_array), (gptr) &tmp_option, i);
       option_value= strchr(tmp_option, '=');
-      /* split the option string into two parts */
-      *option_value= 0;
+      /* split the option string into two parts if it has a value */
+
       position= 0;
-      store_to_string(&send_buff, tmp_option + 2, &position);
-      store_to_string(&send_buff, option_value + 1, &position);
-      /* join name and the value into the same option again */
-      *option_value= '=';
+      if (option_value != NULL)
+      {
+        *option_value= 0;
+        store_to_string(&send_buff, tmp_option + 2, &position);
+        store_to_string(&send_buff, option_value + 1, &position);
+        /* join name and the value into the same option again */
+        *option_value= '=';
+      }
+      else store_to_string(&send_buff, tmp_option + 2, &position);
+
       if (send_buff.is_error() ||
           my_net_write(net, send_buff.buffer, (uint) position))
         goto err;

server-tools/instance-manager/instance.cc

@@ -191,8 +191,8 @@ bool Instance::is_running()
   MYSQL mysql;
   uint port= 0;
   const char *socket= NULL;
-  const char *password= "321rarepassword213";
-  const char *username= "645rareusername945";
+  const char *password= "check_connection";
+  const char *username= "MySQL_Instance_Manager";
   const char *access_denied_message= "Access denied for user";
   bool return_val;
 

server-tools/instance-manager/options.cc

@@ -130,7 +130,7 @@ static void version()
 }
 
 
-static const char *default_groups[]= { "mysql", "manager", 0 };
+static const char *default_groups[]= { "manager", 0 };
 
 
 static void usage()

sql/field.cc

@@ -5573,7 +5573,7 @@ int Field_datetime::store(longlong nr)
   {
     set_datetime_warning(MYSQL_ERROR::WARN_LEVEL_WARN, 
                          ER_WARN_DATA_OUT_OF_RANGE, 
-                         initial_nr, MYSQL_TIMESTAMP_DATE);
+                         initial_nr, MYSQL_TIMESTAMP_DATE, 1);
     error= 1;
   }
 

sql/item_sum.cc

@@ -2670,7 +2670,7 @@ int dump_leaf_key(byte* key, element_count count __attribute__((unused)),
 {
   TABLE *table= item->table;
   char *record= (char*) table->record[0] + table->s->null_bytes;
-  String tmp(table->record[1], table->s->reclength, default_charset_info), tmp2;
+  String tmp((char *)table->record[1], table->s->reclength, default_charset_info), tmp2;
   String *result= &item->result;
   Item **arg= item->args, **arg_end= item->args + item->arg_count_field;