diff options
| author | monty@mashka.mysql.fi <> | 2002-11-21 15:56:48 +0200 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2002-11-21 15:56:48 +0200 |
| commit | dac6498f9b5b28d94473baf46c6e6f174943728d (patch) | |
| tree | d3df5d3fc1abf364dcbcc8eb2305a1cf62540192 /sql/slave.h | |
| parent | 305d16a7cb3955c20ab5d119b3eb0968008683b6 (diff) | |
| parent | e60050c4dd652c7a431aebeb95b7dd944be87bf8 (diff) | |
| download | mariadb-git-dac6498f9b5b28d94473baf46c6e6f174943728d.tar.gz | |
Merge with 4.0
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 74c89f9d755..2c750e415bc 100644 --- a/sql/slave.h +++ b/sql/slave.h @@ -436,8 +436,8 @@ int init_relay_log_pos(RELAY_LOG_INFO* rli,const char* log,ulonglong pos, int purge_relay_logs(RELAY_LOG_INFO* rli, THD *thd, bool just_reset, const char** errmsg); -pthread_handler_decl(handle_slave_io,arg); -pthread_handler_decl(handle_slave_sql,arg); +extern "C" pthread_handler_decl(handle_slave_io,arg); +extern "C" pthread_handler_decl(handle_slave_sql,arg); extern bool volatile abort_loop; extern MASTER_INFO main_mi, *active_mi; /* active_mi for multi-master */ extern volatile int active_mi_in_use; |