diff options
| author | unknown <serg@serg.mylan> | 2005-10-09 19:10:19 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-10-09 19:10:19 +0200 |
| commit | 28a5775b0812384769a57aaec40430f35af0fa3c (patch) | |
| tree | 77b39ce261df192477ba9a78f82bed28feb11e3e /sql/slave.h | |
| parent | 6666f9ba7958bc88866552ce574c4d22634c6d18 (diff) | |
| parent | 20a6f1524aef600d4dc39b9826ddcc4663a8049f (diff) | |
| download | mariadb-git-28a5775b0812384769a57aaec40430f35af0fa3c.tar.gz | |
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
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; |