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

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

server-tools/instance-manager/mysql_connection.cc

@@ -38,6 +38,18 @@
 
 Command *parse_command(Command_factory * factory, const char *text);
 
+Mysql_connection_thread_args::Mysql_connection_thread_args(
+                             struct st_vio *vio_arg,
+                             Thread_registry &thread_registry_arg,
+                             const User_map &user_map_arg,
+                             ulong connection_id_arg,
+                             Instance_map &instance_map_arg) :
+    vio(vio_arg)
+    ,thread_registry(thread_registry_arg)
+    ,user_map(user_map_arg)
+    ,connection_id(connection_id_arg)
+    ,instance_map(instance_map_arg)
+  {}
 
 /*
   MySQL connection - handle one connection with mysql command line client

server-tools/instance-manager/mysql_connection.h

@@ -48,13 +48,7 @@ struct Mysql_connection_thread_args
                                Thread_registry &thread_registry_arg,
                                const User_map &user_map_arg,
                                ulong connection_id_arg,
-                               Instance_map &instance_map_arg) :
-    vio(vio_arg)
-    ,thread_registry(thread_registry_arg)
-    ,user_map(user_map_arg)
-    ,connection_id(connection_id_arg)
-    ,instance_map(instance_map_arg)
-  {}
+                               Instance_map &instance_map_arg);
 };
 
 #endif // INCLUDES_MYSQL_INSTANCE_MANAGER_MYSQL_CONNECTION_H