diff options
| author | serg@serg.mylan <> | 2005-10-09 19:10:19 +0200 |
|---|---|---|
| committer | serg@serg.mylan <> | 2005-10-09 19:10:19 +0200 |
| commit | 2e2d18b7cfb797c4b7bf9be240b1c338039f26b4 (patch) | |
| tree | 77b39ce261df192477ba9a78f82bed28feb11e3e /sql/slave.h | |
| parent | f22fddd1aaedc410200407affaab8a474c2925e9 (diff) | |
| parent | 2c7505b2638d13511db6eb27fc84dc1c37d6efde (diff) | |
| download | mariadb-git-2e2d18b7cfb797c4b7bf9be240b1c338039f26b4.tar.gz | |
Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
Diffstat (limited to 'sql/slave.h')
| -rw-r--r-- | sql/slave.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/slave.h b/sql/slave.h index 486bb3055f5..d99145cbe47 100644 --- a/sql/slave.h +++ b/sql/slave.h @@ -547,8 +547,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; |