Merge alik.:/mnt/raid/alik/MySQL/devel/5.1-monty

into  alik.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged


mysql-test/mysql-test-run.pl:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/table.cc:
  Auto merged
server-tools/instance-manager/guardian.cc:
  Manual merged.
server-tools/instance-manager/instance.cc:
  Manual merged.
server-tools/instance-manager/mysql_connection.cc:
  Manual merged.

1 files changed, 19 insertions, 11 deletions

diff --git a/server-tools/instance-manager/mysql_connection.cc b/server-tools/instance-manager/mysql_connection.cc
index 435c4756b02..82b24491903 100644
--- a/server-tools/instance-manager/mysql_connection.cc
+++ b/server-tools/instance-manager/mysql_connection.cc
@@ -97,7 +97,7 @@ Mysql_connection_thread::Mysql_connection_thread(
                                args.user_map,
                                args.connection_id,
                                args.instance_map)
-  ,thread_info(pthread_self())
+  ,thread_info(pthread_self(), TRUE)
 {
   thread_registry.register_thread(&thread_info);
 }
@@ -165,7 +165,7 @@ Mysql_connection_thread::~Mysql_connection_thread()
 
 void Mysql_connection_thread::run()
 {
-  log_info("accepted mysql connection %lu", connection_id);
+  log_info("accepted mysql connection %lu", (unsigned long) connection_id);
 
   my_thread_init();
 
@@ -175,7 +175,8 @@ void Mysql_connection_thread::run()
     return;
   }
 
-  log_info("connection %lu is checked successfully", connection_id);
+  log_info("connection %lu is checked successfully",
+           (unsigned long) connection_id);
 
   vio_keepalive(vio, TRUE);
 
@@ -315,7 +316,7 @@ int Mysql_connection_thread::do_command()
     enum enum_server_command command= (enum enum_server_command)
                                       (uchar) *packet;
     log_info("connection %lu: packet_length=%lu, command=%d",
-             connection_id, packet_length, command);
+             (int) connection_id, (int) packet_length, (int) command);
     return dispatch_command(command, packet + 1, packet_length - 1);
   }
 }
@@ -325,27 +326,33 @@ int Mysql_connection_thread::dispatch_command(enum enum_server_command command,
 {
   switch (command) {
   case COM_QUIT:                                // client exit
-    log_info("query for connection %lu received quit command", connection_id);
+    log_info("query for connection %lu received quit command",
+             (unsigned long) connection_id);
     return 1;
   case COM_PING:
-    log_info("query for connection %lu received ping command", connection_id);
+    log_info("query for connection %lu received ping command",
+             (unsigned long) connection_id);
     net_send_ok(&net, connection_id, NULL);
     break;
   case COM_QUERY:
   {
     log_info("query for connection %lu : ----\n%s\n-------------------------",
-	     connection_id,packet);
+	     (int) connection_id,
+             (const char *) packet);
     if (Command *command= parse_command(&instance_map, packet))
     {
       int res= 0;
-      log_info("query for connection %lu successfully parsed",connection_id);
+      log_info("query for connection %lu successfully parsed",
+               (unsigned long) connection_id);
       res= command->execute(&net, connection_id);
       delete command;
       if (!res)
-        log_info("query for connection %lu executed ok",connection_id);
+        log_info("query for connection %lu executed ok",
+                 (unsigned long) connection_id);
       else
       {
-        log_info("query for connection %lu executed err=%d",connection_id,res);
+        log_info("query for connection %lu executed err=%d",
+                 (unsigned long) connection_id, (int) res);
         net_send_error(&net, res);
         return 0;
       }
@@ -358,7 +365,8 @@ int Mysql_connection_thread::dispatch_command(enum enum_server_command command,
     break;
   }
   default:
-    log_info("query for connection %lu received unknown command",connection_id);
+    log_info("query for connection %lu received unknown command",
+             (unsigned long) connection_id);
     net_send_error(&net, ER_UNKNOWN_COM_ERROR);
     break;
   }