Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0

into serg.mylan:/usr/home/serg/Abk/mysql-5.1


VC++Files/libmysqld/libmysqld.dsp:
  Auto merged
VC++Files/sql/mysqld.dsp:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
storage/myisam/ft_nlq_search.c:
  Auto merged
storage/myisam/myisamdef.h:
  Auto merged
storage/myisam/sort.c:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Auto merged

1 files changed, 4 insertions, 5 deletions

diff --git a/tools/mysqlmanager.c b/tools/mysqlmanager.c
index 4a5c08be50a..4d507fc3d32 100644
--- a/tools/mysqlmanager.c
+++ b/tools/mysqlmanager.c
@@ -332,8 +332,8 @@ static int client_msg_raw(NET* net,int err_code,int pre,const char* fmt,
 static int authenticate(struct manager_thd* thd);
 /* returns pointer to end of line */
 static char* read_line(struct manager_thd* thd);
-static pthread_handler_decl(process_connection, arg);
-static pthread_handler_decl(process_launcher_messages, arg);
+pthread_handler_t process_connection(void *arg);
+pthread_handler_t process_launcher_messages(void *arg);
 static int exec_line(struct manager_thd* thd,char* buf,char* buf_end);
 
 #ifdef DO_STACKTRACE
@@ -1089,8 +1089,7 @@ static void log_msg(const char* fmt, int msg_type, va_list args)
   pthread_mutex_unlock(&lock_log);
 }
 
-static pthread_handler_decl(process_launcher_messages,
-			    args __attribute__((unused)))
+pthread_handler_t process_launcher_messages(void *arg __attribute__((unused)))
 {
   my_thread_init();
   for (;!in_shutdown;)
@@ -1146,7 +1145,7 @@ static pthread_handler_decl(process_launcher_messages,
   return 0;
 }
 
-static pthread_handler_decl(process_connection,arg)
+pthread_handler_t process_connection(void *arg)
 {
   struct manager_thd* thd = (struct manager_thd*)arg;
   my_thread_init();