diff options
| author | unknown <petr@mysql.com> | 2004-12-17 12:42:53 +0300 |
|---|---|---|
| committer | unknown <petr@mysql.com> | 2004-12-17 12:42:53 +0300 |
| commit | d9f5d2f328f70c7fdc823bb704f7e02bb1d25266 (patch) | |
| tree | 31d10a485a39672a6e5a820e0257196e611df626 | |
| parent | e517bb0da3c578d4d68fb4cb9a5b5d4735a3b236 (diff) | |
| parent | 3ccd78c446e5ff743e2d98530ccc040f0ad3ccf8 (diff) | |
| download | mariadb-git-d9f5d2f328f70c7fdc823bb704f7e02bb1d25266.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/cps/mysql/trees/mysql-5.0
| -rw-r--r-- | server-tools/instance-manager/mysql_connection.cc | 12 | ||||
| -rw-r--r-- | server-tools/instance-manager/mysql_connection.h | 8 |
2 files changed, 13 insertions, 7 deletions
diff --git a/server-tools/instance-manager/mysql_connection.cc b/server-tools/instance-manager/mysql_connection.cc index 0ebcb0eea8d..9365edc7b91 100644 --- a/server-tools/instance-manager/mysql_connection.cc +++ b/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 diff --git a/server-tools/instance-manager/mysql_connection.h b/server-tools/instance-manager/mysql_connection.h index 225f4a352ce..e0109ce234f 100644 --- a/server-tools/instance-manager/mysql_connection.h +++ b/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 |