| List: | Internals | « Previous MessageNext Message » | |
| From: | Sergei Golubchik | Date: | October 8 2005 4:40pm |
| Subject: | bk commit into 5.0 tree (serg:1.2022) | ||
| View as plain text | |||
Below is the list of changes that have just been committed into a local 5.0 repository of serg. When serg does a push these changes will be propagated to the main repository and, within 24 hours after the push, to the public repository. For information on how to access the public repository see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html ChangeSet 1.2022 05/10/08 16:39:55 serg@stripped +27 -0 pthread_handler_decl() changed to be ctags-friendly (and contain extern "C" when necessary) tools/mysqlmanager.c 1.47 05/10/08 16:39:41 serg@stripped +4 -5 pthread_handler_decl() changed to be ctags-friendly (and contain extern "C" when necessary) sql/sql_parse.cc 1.500 05/10/08 16:39:41 serg@stripped +2 -2 pthread_handler_decl() changed to be ctags-friendly (and contain extern "C" when necessary) sql/sql_manager.cc 1.5 05/10/08 16:39:41 serg@stripped +1 -1 pthread_handler_decl() changed to be ctags-friendly (and contain extern "C" when necessary) sql/sql_insert.cc 1.176 05/10/08 16:39:41 serg@stripped +2 -2 pthread_handler_decl() changed to be ctags-friendly (and contain extern "C" when necessary) sql/sql_class.h 1.269 05/10/08 16:39:41 serg@stripped +2 -2 pthread_handler_decl() changed to be ctags-friendly (and contain extern "C" when necessary) sql/slave.h 1.90 05/10/08 16:39:41 serg@stripped +2 -2 pthread_handler_decl() changed to be ctags-friendly (and contain extern "C" when necessary) sql/slave.cc 1.259 05/10/08 16:39:40 serg@stripped +5 -5 pthread_handler_decl() changed to be ctags-friendly (and contain extern "C" when necessary) sql/repl_failsafe.h 1.12 05/10/08 16:39:40 serg@stripped +1 -1 pthread_handler_decl() changed to be ctags-friendly (and contain extern "C" when necessary) sql/repl_failsafe.cc 1.57 05/10/08 16:39:40 serg@stripped +1 -1 pthread_handler_decl() changed to be ctags-friendly (and contain extern "C" when necessary) sql/mysqld.cc 1.509 05/10/08 16:39:40 serg@stripped +14 -16 pthread_handler_decl() changed to be ctags-friendly (and contain extern "C" when necessary) sql/mysql_priv.h 1.360 05/10/08 16:39:40 serg@stripped +3 -3 pthread_handler_decl() changed to be ctags-friendly (and contain extern "C" when necessary) sql/ha_ndbcluster.cc 1.214 05/10/08 16:39:39 serg@stripped +2 -3 pthread_handler_decl() changed to be ctags-friendly (and contain extern "C" when necessary) server-tools/instance-manager/mysql_connection.h 1.4 05/10/08 16:39:39 serg@stripped +1 -6 pthread_handler_decl() changed to be ctags-friendly (and contain extern "C" when necessary) server-tools/instance-manager/mysql_connection.cc 1.13 05/10/08 16:39:39 serg@stripped +1 -6 pthread_handler_decl() changed to be ctags-friendly (and contain extern "C" when necessary) server-tools/instance-manager/listener.h 1.5 05/10/08 16:39:39 serg@stripped +1 -5 pthread_handler_decl() changed to be ctags-friendly (and contain extern "C" when necessary) server-tools/instance-manager/listener.cc 1.21 05/10/08 16:39:39 serg@stripped +1 -7 pthread_handler_decl() changed to be ctags-friendly (and contain extern "C" when necessary) server-tools/instance-manager/instance.cc 1.27 05/10/08 16:39:39 serg@stripped +1 -6 pthread_handler_decl() changed to be ctags-friendly (and contain extern "C" when necessary) server-tools/instance-manager/guardian.h 1.12 05/10/08 16:39:39 serg@stripped +1 -5 pthread_handler_decl() changed to be ctags-friendly (and contain extern "C" when necessary) server-tools/instance-manager/guardian.cc 1.19 05/10/08 16:39:39 serg@stripped +1 -6 pthread_handler_decl() changed to be ctags-friendly (and contain extern "C" when necessary) ndb/src/ndbapi/ndb_cluster_connection.cpp 1.31 05/10/08 16:39:39 serg@stripped +1 -1 pthread_handler_decl() changed to be ctags-friendly (and contain extern "C" when necessary) mysys/my_winthread.c 1.12 05/10/08 16:39:38 serg@stripped +1 -1 pthread_handler_decl() changed to be ctags-friendly (and contain extern "C" when necessary) mysys/my_os2thread.c 1.5 05/10/08 16:39:38 serg@stripped +1 -1 pthread_handler_decl() changed to be ctags-friendly (and contain extern "C" when necessary) myisam/sort.c 1.48 05/10/08 16:39:38 serg@stripped +1 -1 pthread_handler_decl() changed to be ctags-friendly (and contain extern "C" when necessary) myisam/myisamdef.h 1.82 05/10/08 16:39:38 serg@stripped +1 -1 pthread_handler_decl() changed to be ctags-friendly (and contain extern "C" when necessary) include/my_pthread.h 1.86 05/10/08 16:39:38 serg@stripped +7 -4 pthread_handler_decl() changed to be ctags-friendly (and contain extern "C" when necessary) VC++Files/thr_test/thr_test.c 1.2 05/10/08 16:39:38 serg@stripped +2 -2 pthread_handler_decl() changed to be ctags-friendly (and contain extern "C" when necessary) VC++Files/test1/mysql_thr.c 1.3 05/10/08 16:39:38 serg@stripped +2 -2 pthread_handler_decl() changed to be ctags-friendly (and contain extern "C" when necessary) # This is a BitKeeper patch. What follows are the unified diffs for the # set of deltas contained in the patch. The rest of the patch, the part # that BitKeeper cares about, is below these diffs. # User: serg # Host: serg.mylan # Root: /usr/home/serg/Abk/mysql-5.0 --- 1.85/include/my_pthread.h Thu Oct 6 00:40:56 2005 +++ 1.86/include/my_pthread.h Sat Oct 8 16:39:38 2005 @@ -25,7 +25,10 @@ #endif #ifdef __cplusplus +#define EXTERN_C extern "C" extern "C" { +#else +#define EXTERN_C #endif /* __cplusplus */ #if defined(__WIN__) || defined(OS2) @@ -77,10 +80,10 @@ struct timespec { /* For pthread_cond_t typedef int pthread_mutexattr_t; #define win_pthread_self my_thread_var->pthread_self #ifdef OS2 -#define pthread_handler_decl(A,B) void * _Optlink A(void *B) +#define pthread_handler_t EXTERN_C void * _Optlink typedef void * (_Optlink *pthread_handler)(void *); #else -#define pthread_handler_decl(A,B) void * __cdecl A(void *B) +#define pthread_handler_t EXTERN_C void * __cdecl typedef void * (__cdecl *pthread_handler)(void *); #endif @@ -184,7 +187,7 @@ typedef int pthread_attr_t; /* Needed #define pthread_key_create(A,B) thr_keycreate((A),(B)) #define pthread_key_delete(A) thr_keydelete(A) -#define pthread_handler_decl(A,B) void *A(void *B) +#define pthread_handler_t EXTERN_C void * #define pthread_key(T,V) pthread_key_t V void * my_pthread_getspecific_imp(pthread_key_t key); @@ -262,7 +265,7 @@ extern int my_pthread_getprio(pthread_t #define my_pthread_getspecific_ptr(T,V) my_pthread_getspecific(T,(V)) #define my_pthread_setspecific_ptr(T,V) pthread_setspecific(T,(void*) (V)) #define pthread_detach_this_thread() -#define pthread_handler_decl(A,B) void *A(void *B) +#define pthread_handler_t EXTERN_C void * typedef void *(* pthread_handler)(void *); /* Test first for RTS or FSU threads */ --- 1.81/myisam/myisamdef.h Fri Sep 30 12:56:24 2005 +++ 1.82/myisam/myisamdef.h Sat Oct 8 16:39:38 2005 @@ -728,7 +728,7 @@ int flush_pending_blocks(MI_SORT_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); --- 1.47/myisam/sort.c Tue Aug 2 21:00:48 2005 +++ 1.48/myisam/sort.c Sat Oct 8 16:39:38 2005 @@ -307,7 +307,7 @@ static ha_rows NEAR_F find_all_keys(MI_S #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; --- 1.11/mysys/my_winthread.c Thu Dec 6 13:10:43 2001 +++ 1.12/mysys/my_winthread.c Sat Oct 8 16:39:38 2005 @@ -51,7 +51,7 @@ void win_pthread_init(void) ** in the new thread. */ -static pthread_handler_decl(pthread_start,param) +pthread_handler_t pthread_start(void *param) { pthread_handler func=((struct pthread_map *) param)->func; void *func_param=((struct pthread_map *) param)->param; --- 1.359/sql/mysql_priv.h Thu Oct 6 00:40:54 2005 +++ 1.360/sql/mysql_priv.h Sat Oct 8 16:39:40 2005 @@ -610,8 +610,8 @@ bool multi_delete_set_locks_and_link_aux void init_max_user_conn(void); void init_update_queries(void); void free_max_user_conn(void); -extern "C" pthread_handler_decl(handle_one_connection,arg); -extern "C" pthread_handler_decl(handle_bootstrap,arg); +pthread_handler_t handle_one_connection(void *arg); +pthread_handler_t handle_bootstrap(void *arg); void end_thread(THD *thd,bool put_in_cache); void flush_thread_cache(); bool mysql_execute_command(THD *thd); @@ -1035,7 +1035,7 @@ int write_record(THD *thd, TABLE *table, extern ulong volatile manager_status; extern bool volatile manager_thread_in_use, mqh_used; extern pthread_t manager_thread; -extern "C" pthread_handler_decl(handle_manager, arg); +pthread_handler_t handle_manager(void *arg); /* sql_test.cc */ #ifndef DBUG_OFF --- 1.508/sql/mysqld.cc Tue Oct 4 18:52:04 2005 +++ 1.509/sql/mysqld.cc Sat Oct 8 16:39:40 2005 @@ -587,25 +587,25 @@ struct st_VioSSLAcceptorFd *ssl_acceptor /* Function declarations */ static void start_signal_handler(void); -static pthread_handler_decl(signal_hand, arg); +pthread_handler_t signal_hand(void *arg); static void mysql_init_variables(void); static void get_options(int argc,char **argv); static void set_server_version(void); static int init_thread_environment(); static char *get_relative_path(const char *path); static void fix_paths(void); -extern "C" pthread_handler_decl(handle_connections_sockets,arg); -extern "C" pthread_handler_decl(kill_server_thread,arg); +pthread_handler_t handle_connections_sockets(void *arg); +pthread_handler_t kill_server_thread(void *arg); static void bootstrap(FILE *file); static void close_server_sock(); static bool read_init_file(char *file_name); #ifdef __NT__ -extern "C" pthread_handler_decl(handle_connections_namedpipes,arg); +pthread_handler_t handle_connections_namedpipes(void *arg); #endif #ifdef HAVE_SMEM -static pthread_handler_decl(handle_connections_shared_memory,arg); +pthread_handler_t handle_connections_shared_memory(void *arg); #endif -extern "C" pthread_handler_decl(handle_slave,arg); +pthread_handler_t handle_slave(void *arg); static ulong find_bit_type(const char *x, TYPELIB *bit_lib); static void clean_up(bool print_message); static void clean_up_mutexes(void); @@ -954,7 +954,7 @@ static void __cdecl kill_server(int sig_ #if defined(USE_ONE_SIGNAL_HAND) || (defined(__NETWARE__) && defined(SIGNALS_DONT_BREAK_READ)) -extern "C" pthread_handler_decl(kill_server_thread,arg __attribute__((unused))) +pthread_handler_t kill_server_thread(void *arg __attribute__((unused))) { my_thread_init(); // Initialize new thread kill_server(0); @@ -2388,7 +2388,7 @@ int uname(struct utsname *a) } -extern "C" pthread_handler_decl(handle_shutdown,arg) +pthread_handler_t handle_shutdown(void *arg) { MSG msg; my_thread_init(); @@ -2417,7 +2417,7 @@ int STDCALL handle_kill(ulong ctrl_type) #ifdef OS2 -extern "C" pthread_handler_decl(handle_shutdown,arg) +pthread_handler_t handle_shutdown(void *arg) { my_thread_init(); @@ -3731,8 +3731,7 @@ inline void kill_broken_server() /* Handle new connections and spawn new process to handle them */ #ifndef EMBEDDED_LIBRARY -extern "C" pthread_handler_decl(handle_connections_sockets, - arg __attribute__((unused))) +pthread_handler_t handle_connections_sockets(void *arg __attribute__((unused))) { my_socket sock,new_sock; uint error_count=0; @@ -3946,7 +3945,7 @@ extern "C" pthread_handler_decl(handle_c #ifdef __NT__ -extern "C" pthread_handler_decl(handle_connections_namedpipes,arg) +pthread_handler_t handle_connections_namedpipes(void *arg) { HANDLE hConnectedPipe; BOOL fConnected; @@ -4032,17 +4031,16 @@ extern "C" pthread_handler_decl(handle_c Thread of shared memory's service SYNOPSIS - pthread_handler_decl() - handle_connections_shared_memory Thread handle + handle_connections_shared_memory() arg Arguments of thread */ #ifdef HAVE_SMEM -pthread_handler_decl(handle_connections_shared_memory,arg) +pthread_handler_t handle_connections_shared_memory(void *arg) { /* file-mapping object, use for create shared memory */ HANDLE handle_connect_file_map= 0; - char *handle_connect_map= 0; // pointer on shared memory + char *handle_connect_map= 0; // pointer on shared memory HANDLE event_connect_answer= 0; ulong smem_buffer_length= shared_memory_buffer_length + 4; ulong connect_number= 1; --- 1.258/sql/slave.cc Tue Oct 4 18:52:04 2005 +++ 1.259/sql/slave.cc Sat Oct 8 16:39:40 2005 @@ -3325,7 +3325,7 @@ on this slave.\ /* Slave I/O Thread entry point */ -extern "C" pthread_handler_decl(handle_slave_io,arg) +pthread_handler_t handle_slave_io(void *arg) { THD *thd; // needs to be first for thread_stack MYSQL *mysql; @@ -3634,7 +3634,7 @@ err: #ifndef DBUG_OFF if (abort_slave_event_count && !events_till_abort) goto slave_begin; -#endif +#endif my_thread_end(); pthread_exit(0); DBUG_RETURN(0); // Can't return anything here @@ -3643,11 +3643,11 @@ err: /* Slave SQL Thread entry point */ -extern "C" pthread_handler_decl(handle_slave_sql,arg) +pthread_handler_t handle_slave_sql(void *arg) { THD *thd; /* needs to be first for thread_stack */ char llbuff[22],llbuff1[22]; - RELAY_LOG_INFO* rli = &((MASTER_INFO*)arg)->rli; + RELAY_LOG_INFO* rli = &((MASTER_INFO*)arg)->rli; const char *errmsg; // needs to call my_thread_init(), otherwise we get a coredump in DBUG_ stuff @@ -3655,7 +3655,7 @@ extern "C" pthread_handler_decl(handle_s DBUG_ENTER("handle_slave_sql"); #ifndef DBUG_OFF -slave_begin: +slave_begin: #endif DBUG_ASSERT(rli->inited); --- 1.268/sql/sql_class.h Thu Sep 22 22:46:50 2005 +++ 1.269/sql/sql_class.h Sat Oct 8 16:39:41 2005 @@ -1146,8 +1146,8 @@ public: thread is (and must remain, for now) the only responsible for freeing these 3 members. If you add members here, and you add code to set them in replication, don't forget to free_them_and_set_them_to_0 in replication - properly. For details see the 'err:' label of the pthread_handler_decl of - the slave SQL thread, in sql/slave.cc. + properly. For details see the 'err:' label of the handle_slave_sql() + in sql/slave.cc. */ char *db, *catalog; Security_context main_security_ctx; --- 1.175/sql/sql_insert.cc Thu Sep 15 21:29:01 2005 +++ 1.176/sql/sql_insert.cc Sat Oct 8 16:39:41 2005 @@ -28,7 +28,7 @@ static TABLE *delayed_get_table(THD *thd static int write_delayed(THD *thd,TABLE *table, enum_duplicates dup, bool ignore, char *query, uint query_length, bool log_on); static void end_delayed_insert(THD *thd); -extern "C" pthread_handler_decl(handle_delayed_insert,arg); +pthread_handler_t handle_delayed_insert(void *arg); static void unlink_blobs(register TABLE *table); #endif static bool check_view_insertability(THD *thd, TABLE_LIST *view); @@ -1691,7 +1691,7 @@ void kill_delayed_threads(void) * Create a new delayed insert thread */ -extern "C" pthread_handler_decl(handle_delayed_insert,arg) +pthread_handler_t handle_delayed_insert(void *arg) { delayed_insert *di=(delayed_insert*) arg; THD *thd= &di->thd; --- 1.499/sql/sql_parse.cc Wed Oct 5 19:58:04 2005 +++ 1.500/sql/sql_parse.cc Sat Oct 8 16:39:41 2005 @@ -1046,7 +1046,7 @@ void execute_init_command(THD *thd, sys_ } -pthread_handler_decl(handle_one_connection,arg) +pthread_handler_t handle_one_connection(void *arg) { THD *thd=(THD*) arg; uint launch_time = @@ -1182,7 +1182,7 @@ end_thread: Used when creating the initial grant tables */ -extern "C" pthread_handler_decl(handle_bootstrap,arg) +pthread_handler_t handle_bootstrap(void *arg) { THD *thd=(THD*) arg; FILE *file=bootstrap_file; --- 1.1/VC++Files/thr_test/thr_test.c Sat Sep 13 01:58:12 2003 +++ 1.2/VC++Files/thr_test/thr_test.c Sat Oct 8 16:39:38 2005 @@ -44,7 +44,7 @@ typedef CRITICAL_SECTION pthread_mutex_t #define pthread_mutex_lock(A) (EnterCriticalSection(A),0) #define pthread_mutex_unlock(A) LeaveCriticalSection(A) #define pthread_mutex_destroy(A) DeleteCriticalSection(A) -#define pthread_handler_decl(A,B) unsigned __cdecl A(void *B) +#define pthread_handler_t unsigned __cdecl * typedef unsigned (__cdecl *pthread_handler)(void *); #define pthread_self() GetCurrentThread() @@ -174,7 +174,7 @@ int _my_errno(void) ** The test program *****************************************************************************/ -pthread_handler_decl(test_thread,arg) +pthread_handler_t test_thread(void *arg) { pthread_mutex_lock(&LOCK_thread_count); thread_count--; --- 1.20/server-tools/instance-manager/listener.cc Fri Sep 23 20:28:47 2005 +++ 1.21/server-tools/instance-manager/listener.cc Sat Oct 8 16:39:39 2005 @@ -372,10 +372,7 @@ void Listener_thread::handle_new_mysql_c } -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); @@ -386,7 +383,4 @@ pthread_handler_decl(listener, arg) */ return 0; } - - -C_MODE_END --- 1.4/server-tools/instance-manager/listener.h Fri Sep 23 20:28:47 2005 +++ 1.5/server-tools/instance-manager/listener.h Sat Oct 8 16:39:39 2005 @@ -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; --- 1.213/sql/ha_ndbcluster.cc Tue Oct 4 21:43:42 2005 +++ 1.214/sql/ha_ndbcluster.cc Sat Oct 8 16:39:39 2005 @@ -121,7 +121,7 @@ static int ndb_get_table_statistics(Ndb* static pthread_t ndb_util_thread; pthread_mutex_t LOCK_ndb_util_thread; pthread_cond_t COND_ndb_util_thread; -extern "C" pthread_handler_decl(ndb_util_thread_func, arg); +pthread_handler_t ndb_util_thread_func(void *arg); ulong ndb_cache_check_time; /* @@ -5926,8 +5926,7 @@ ha_ndbcluster::update_table_comment( // Utility thread main loop -extern "C" pthread_handler_decl(ndb_util_thread_func, - arg __attribute__((unused))) +pthread_handler_t ndb_util_thread_func(void *arg __attribute__((unused))) { THD *thd; /* needs to be first for thread_stack */ Ndb* ndb; --- 1.4/mysys/my_os2thread.c Tue Jan 28 07:38:22 2003 +++ 1.5/mysys/my_os2thread.c Sat Oct 8 16:39:38 2005 @@ -51,7 +51,7 @@ void win_pthread_init(void) ** in the new thread. */ -static pthread_handler_decl(pthread_start,param) +pthread_handler_t pthread_start(void *param) { DBUG_ENTER("pthread_start"); pthread_handler func=((struct pthread_map *) param)->func; --- 1.18/server-tools/instance-manager/guardian.cc Fri Sep 23 20:28:46 2005 +++ 1.19/server-tools/instance-manager/guardian.cc Sat Oct 8 16:39:39 2005 @@ -33,17 +33,12 @@ -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, --- 1.11/server-tools/instance-manager/guardian.h Fri Sep 23 20:28:46 2005 +++ 1.12/server-tools/instance-manager/guardian.h Sat Oct 8 16:39:39 2005 @@ -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 { --- 1.26/server-tools/instance-manager/instance.cc Fri Sep 23 20:28:46 2005 +++ 1.27/server-tools/instance-manager/instance.cc Sat Oct 8 16:39:39 2005 @@ -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,16 +50,13 @@ 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, instance->get_map()); return 0; } - -C_MODE_END - /* Wait for an instance --- 1.12/server-tools/instance-manager/mysql_connection.cc Fri Sep 23 20:28:47 2005 +++ 1.13/server-tools/instance-manager/mysql_connection.cc Sat Oct 8 16:39:39 2005 @@ -364,9 +364,7 @@ int Mysql_connection_thread::dispatch_co } -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); @@ -380,9 +378,6 @@ pthread_handler_decl(mysql_connection, a } return 0; } - -C_MODE_END - /* vim: fdm=marker --- 1.3/server-tools/instance-manager/mysql_connection.h Fri Sep 23 20:28:47 2005 +++ 1.4/server-tools/instance-manager/mysql_connection.h Sat Oct 8 16:39:39 2005 @@ -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; --- 1.89/sql/slave.h Tue Oct 4 18:52:04 2005 +++ 1.90/sql/slave.h Sat Oct 8 16:39:41 2005 @@ -572,8 +572,8 @@ void set_slave_thread_options(THD* thd); void set_slave_thread_default_charset(THD* thd, RELAY_LOG_INFO *rli); void rotate_relay_log(MASTER_INFO* mi); -extern "C" pthread_handler_decl(handle_slave_io,arg); -extern "C" pthread_handler_decl(handle_slave_sql,arg); +pthread_handler_t handle_slave_io(void *arg); +pthread_handler_t handle_slave_sql(void *arg); extern bool volatile abort_loop; extern MASTER_INFO main_mi, *active_mi; /* active_mi for multi-master */ extern LIST master_list; --- 1.56/sql/repl_failsafe.cc Thu Sep 15 21:29:00 2005 +++ 1.57/sql/repl_failsafe.cc Sat Oct 8 16:39:40 2005 @@ -578,7 +578,7 @@ int find_recovery_captain(THD* thd, MYSQ } -pthread_handler_decl(handle_failsafe_rpl,arg) +pthread_handler_t handle_failsafe_rpl(void *arg) { DBUG_ENTER("handle_failsafe_rpl"); THD *thd = new THD; --- 1.11/sql/repl_failsafe.h Fri Nov 12 13:38:33 2004 +++ 1.12/sql/repl_failsafe.h Sat Oct 8 16:39:40 2005 @@ -31,7 +31,7 @@ extern pthread_cond_t COND_rpl_status; extern TYPELIB rpl_role_typelib, rpl_status_typelib; extern const char* rpl_role_type[], *rpl_status_type[]; -pthread_handler_decl(handle_failsafe_rpl,arg); +pthread_handler_t handle_failsafe_rpl(void *arg); void change_rpl_status(RPL_STATUS from_status, RPL_STATUS to_status); int find_recovery_captain(THD* thd, MYSQL* mysql); int update_slave_list(MYSQL* mysql, MASTER_INFO* mi); --- 1.46/tools/mysqlmanager.c Tue Apr 26 12:03:33 2005 +++ 1.47/tools/mysqlmanager.c Sat Oct 8 16:39:41 2005 @@ -332,8 +332,8 @@ static int client_msg_raw(NET* net,int e 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 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_laun 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(); --- 1.4/sql/sql_manager.cc Thu Nov 7 02:53:08 2002 +++ 1.5/sql/sql_manager.cc Sat Oct 8 16:39:41 2005 @@ -32,7 +32,7 @@ pthread_t manager_thread; pthread_mutex_t LOCK_manager; pthread_cond_t COND_manager; -extern "C" pthread_handler_decl(handle_manager,arg __attribute__((unused))) +pthread_handler_t handle_manager(void *arg __attribute__((unused))) { int error = 0; ulong status; --- 1.30/ndb/src/ndbapi/ndb_cluster_connection.cpp Wed May 18 20:45:24 2005 +++ 1.31/ndb/src/ndbapi/ndb_cluster_connection.cpp Sat Oct 8 16:39:39 2005 @@ -86,7 +86,7 @@ const char *Ndb_cluster_connection::get_ 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(); --- 1.2/VC++Files/test1/mysql_thr.c Thu Dec 9 14:44:02 2004 +++ 1.3/VC++Files/test1/mysql_thr.c Sat Oct 8 16:39:38 2005 @@ -33,7 +33,7 @@ typedef CRITICAL_SECTION pthread_mutex_t #define pthread_mutex_lock(A) (EnterCriticalSection(A),0) #define pthread_mutex_unlock(A) LeaveCriticalSection(A) #define pthread_mutex_destroy(A) DeleteCriticalSection(A) -#define pthread_handler_decl(A,B) unsigned __cdecl A(void *B) +#define pthread_handler_t unsigned __cdecl * typedef unsigned (__cdecl *pthread_handler)(void *); #define pthread_self() GetCurrentThread() @@ -155,7 +155,7 @@ int _my_errno(void) ** The test program *****************************************************************************/ -pthread_handler_decl(test_thread,arg) +pthread_handler_t test_thread(void *arg) { MYSQL mysql; MYSQL_RES *res;
| Thread | ||
|---|---|---|
| • bk commit into 5.0 tree (serg:1.2022) | Sergei Golubchik | 9 Oct |
© 1995-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
Page generated in 0.787 sec. using MySQL 5.1.14-beta-log