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

7 files changed, 7 insertions, 41 deletions

diff --git a/server-tools/instance-manager/guardian.cc b/server-tools/instance-manager/guardian.cc
index a4c0cef41b3..291b685ef1b 100644
--- a/server-tools/instance-manager/guardian.cc
+++ b/server-tools/instance-manager/guardian.cc
@@ -33,18 +33,13 @@
 
 
 
-C_MODE_START
-
-pthread_handler_decl(guardian, arg)
+pthread_handler_t guardian(void *arg)
 {
   Guardian_thread *guardian_thread= (Guardian_thread *) arg;
   guardian_thread->run();
   return 0;
 }
 
-C_MODE_END
-
-
 Guardian_thread::Guardian_thread(Thread_registry &thread_registry_arg,
                                  Instance_map *instance_map_arg,
                                  uint monitoring_interval_arg) :
diff --git a/server-tools/instance-manager/guardian.h b/server-tools/instance-manager/guardian.h
index 16180e72dc9..16b4c373c91 100644
--- a/server-tools/instance-manager/guardian.h
+++ b/server-tools/instance-manager/guardian.h
@@ -31,11 +31,7 @@ class Instance_map;
 class Thread_registry;
 struct GUARD_NODE;
 
-C_MODE_START
-
-pthread_handler_decl(guardian, arg);
-
-C_MODE_END
+pthread_handler_t guardian(void *arg);
 
 struct Guardian_thread_args
 {
diff --git a/server-tools/instance-manager/instance.cc b/server-tools/instance-manager/instance.cc
index 0c3c1aee5b4..ff3387334b6 100644
--- a/server-tools/instance-manager/instance.cc
+++ b/server-tools/instance-manager/instance.cc
@@ -43,8 +43,6 @@ typedef pid_t My_process_info;
 typedef PROCESS_INFORMATION My_process_info;
 #endif
 
-C_MODE_START
-
 /*
   Proxy thread is a simple way to avoid all pitfalls of the threads
   implementation in the OS (e.g. LinuxThreads). With such a thread we
@@ -52,7 +50,7 @@ C_MODE_START
   to do it in a portable way.
 */
 
-pthread_handler_decl(proxy, arg)
+pthread_handler_t proxy(void *arg)
 {
   Instance *instance= (Instance *) arg;
   start_and_monitor_instance(&instance->options,
@@ -60,9 +58,6 @@ pthread_handler_decl(proxy, arg)
   return 0;
 }
 
-C_MODE_END
-
-
 /*
   Wait for an instance
 
diff --git a/server-tools/instance-manager/listener.cc b/server-tools/instance-manager/listener.cc
index a1c1a743c24..08c28dc9f7d 100644
--- a/server-tools/instance-manager/listener.cc
+++ b/server-tools/instance-manager/listener.cc
@@ -372,10 +372,7 @@ void Listener_thread::handle_new_mysql_connection(Vio *vio)
 }
 
 
-C_MODE_START
-
-
-pthread_handler_decl(listener, arg)
+pthread_handler_t listener(void *arg)
 {
   Listener_thread_args *args= (Listener_thread_args *) arg;
   Listener_thread listener(*args);
@@ -387,6 +384,3 @@ pthread_handler_decl(listener, arg)
   return 0;
 }
 
-
-C_MODE_END
-
diff --git a/server-tools/instance-manager/listener.h b/server-tools/instance-manager/listener.h
index 3f5a80f1f53..e0ab5b8ef2b 100644
--- a/server-tools/instance-manager/listener.h
+++ b/server-tools/instance-manager/listener.h
@@ -24,11 +24,7 @@
 #include <my_pthread.h>
 
 
-C_MODE_START
-
-pthread_handler_decl(listener, arg);
-
-C_MODE_END
+pthread_handler_t listener(void *arg);
 
 class Thread_registry;
 struct Options;
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 
 */
diff --git a/server-tools/instance-manager/mysql_connection.h b/server-tools/instance-manager/mysql_connection.h
index 2ff55d81e57..492937b2198 100644
--- a/server-tools/instance-manager/mysql_connection.h
+++ b/server-tools/instance-manager/mysql_connection.h
@@ -24,12 +24,7 @@
 #include <my_pthread.h>
 
 
-C_MODE_START
-
-pthread_handler_decl(mysql_connection, arg);
-
-C_MODE_END
-
+pthread_handler_t mysql_connection(void *arg);
 
 class Thread_registry;
 class User_map;