diff options
| author | serg@serg.mylan <> | 2005-10-08 16:39:55 +0200 |
|---|---|---|
| committer | serg@serg.mylan <> | 2005-10-08 16:39:55 +0200 |
| commit | e91712d9bbd43f2153ed0623a651844de45b7796 (patch) | |
| tree | 5131856f24706c7b976877506a4c7f7a2615d9e6 /sql/slave.cc | |
| parent | b05a6d8fdadc7117e2931c66ff8a90d6bc476de0 (diff) | |
| download | mariadb-git-e91712d9bbd43f2153ed0623a651844de45b7796.tar.gz | |
pthread_handler_decl() changed to be ctags-friendly
(and contain extern "C" when necessary)
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index b1763187d04..0e810b798f9 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -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_slave_sql,arg) DBUG_ENTER("handle_slave_sql"); #ifndef DBUG_OFF -slave_begin: +slave_begin: #endif DBUG_ASSERT(rli->inited); |