mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 03:21:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
into mysql.com:/home/cps/mysql/trees/mysql-5.0
This commit is contained in:
petr@mysql.com 2004-12-17 12:42:53 +03:00
commit 59e156baaa
2 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
server-tools/instance-manager/mysql_connection.cc
View file

@ -38,6 +38,18 @@
Command *parse_command(Command_factory * factory, const char *text); 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 MySQL connection - handle one connection with mysql command line client

8
server-tools/instance-manager/mysql_connection.h
View file

@ -48,13 +48,7 @@ struct Mysql_connection_thread_args
Thread_registry &thread_registry_arg, Thread_registry &thread_registry_arg,
const User_map &user_map_arg, const User_map &user_map_arg,
ulong connection_id_arg, ulong connection_id_arg,
Instance_map &instance_map_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)
{}
}; };
#endif // INCLUDES_MYSQL_INSTANCE_MANAGER_MYSQL_CONNECTION_H #endif // INCLUDES_MYSQL_INSTANCE_MANAGER_MYSQL_CONNECTION_H