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

storage/myisam/ft_nlq_search.c

@@ -266,7 +266,8 @@ FT_INFO *ft_init_nlq_search(MI_INFO *info, uint keynr, byte *query,
     so if ndocs == 0, FT_INFO.doc[] must not be accessed.
    */
   dlist=(FT_INFO *)my_malloc(sizeof(FT_INFO)+
-			     sizeof(FT_DOC)*(aio.dtree.elements_in_tree-1),
+			     sizeof(FT_DOC)*
+			     (int)(aio.dtree.elements_in_tree-1),
 			     MYF(0));
   if (!dlist)
     goto err;

storage/myisam/myisamdef.h

@@ -728,7 +728,7 @@ int flush_pending_blocks(MI_SORT_PARAM *param);
 int sort_ft_buf_flush(MI_SORT_PARAM *sort_param);
 int thr_write_keys(MI_SORT_PARAM *sort_param);
 #ifdef THREAD
-pthread_handler_decl(thr_find_all_keys,arg);
+pthread_handler_t thr_find_all_keys(void *arg);
 #endif
 int flush_blocks(MI_CHECK *param, KEY_CACHE *key_cache, File file);
 

storage/myisam/sort.c

@@ -307,7 +307,7 @@ static ha_rows NEAR_F find_all_keys(MI_SORT_PARAM *info, uint keys,
 #ifdef THREAD
 /* Search after all keys and place them in a temp. file */
 
-pthread_handler_decl(thr_find_all_keys,arg)
+pthread_handler_t thr_find_all_keys(void *arg)
 {
   MI_SORT_PARAM *info= (MI_SORT_PARAM*) arg;
   int error;

storage/ndb/src/ndbapi/ndb_cluster_connection.cpp

@@ -85,7 +85,7 @@ const char *Ndb_cluster_connection::get_connectstring(char *buf,
   return 0;
 }
 
-extern "C" pthread_handler_decl(run_ndb_cluster_connection_connect_thread, me)
+pthread_handler_t run_ndb_cluster_connection_connect_thread(void *me)
 {
   g_run_connect_thread= 1;
   ((Ndb_cluster_connection_impl*) me)->connect_thread();