diff options
| author | unknown <serg@serg.mylan> | 2005-10-08 16:59:41 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-10-08 16:59:41 +0200 |
| commit | eb4da9fda7466de43bc6730950fbe27b442ac474 (patch) | |
| tree | d5db6d4dd011c049aeb0cfea2b3146642da2d4f0 /server-tools/instance-manager/mysql_connection.cc | |
| parent | 63e7824fc2cb5fec43cafbc59d17e5cfcc2195b3 (diff) | |
| parent | 3a97babbc28178038448819a5d6f3da9ef8731c3 (diff) | |
| download | mariadb-git-eb4da9fda7466de43bc6730950fbe27b442ac474.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
server-tools/instance-manager/mysql_connection.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'server-tools/instance-manager/mysql_connection.cc')
| -rw-r--r-- | server-tools/instance-manager/mysql_connection.cc | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/server-tools/instance-manager/mysql_connection.cc b/server-tools/instance-manager/mysql_connection.cc index f3c21f7da27..bf39c843f0a 100644 --- a/server-tools/instance-manager/mysql_connection.cc +++ b/server-tools/instance-manager/mysql_connection.cc @@ -364,9 +364,7 @@ int Mysql_connection_thread::dispatch_command(enum enum_server_command command, } -C_MODE_START - -pthread_handler_decl(mysql_connection, arg) +pthread_handler_t mysql_connection(void *arg) { Mysql_connection_thread_args *args= (Mysql_connection_thread_args *) arg; Mysql_connection_thread mysql_connection_thread(*args); @@ -381,9 +379,6 @@ pthread_handler_decl(mysql_connection, arg) return 0; } -C_MODE_END - - /* vim: fdm=marker */ |