diff options
| author | serg@serg.mylan <> | 2005-02-14 21:50:09 +0100 |
|---|---|---|
| committer | serg@serg.mylan <> | 2005-02-14 21:50:09 +0100 |
| commit | fd828e5b4d7f20a64bccfc25a096ca94760bcec9 (patch) | |
| tree | ea9dd08a255018554104b4f137dea7cfe36ece0a /sql/sql_repl.h | |
| parent | 2b49bea59a594a0f4a87200adca21fb0cc3b2893 (diff) | |
| parent | db13afd89db4a415e2a77b0c200a1391ea2f03fe (diff) | |
| download | mariadb-git-fd828e5b4d7f20a64bccfc25a096ca94760bcec9.tar.gz | |
manually merged
Diffstat (limited to 'sql/sql_repl.h')
| -rw-r--r-- | sql/sql_repl.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sql/sql_repl.h b/sql/sql_repl.h index e8497fee343..b901d7cfe0c 100644 --- a/sql/sql_repl.h +++ b/sql/sql_repl.h @@ -36,15 +36,16 @@ extern I_List<i_string> binlog_do_db, binlog_ignore_db; extern int max_binlog_dump_events; extern my_bool opt_sporadic_binlog_dump_fail; -#define KICK_SLAVE(thd) { pthread_mutex_lock(&(thd)->LOCK_delete); (thd)->awake(THD::NOT_KILLED); pthread_mutex_unlock(&(thd)->LOCK_delete); } - -File open_binlog(IO_CACHE *log, const char *log_file_name, - const char **errmsg); +#define KICK_SLAVE(thd) do { \ + pthread_mutex_lock(&(thd)->LOCK_delete); \ + (thd)->awake(THD::NOT_KILLED); \ + pthread_mutex_unlock(&(thd)->LOCK_delete); \ + } while(0) int start_slave(THD* thd, MASTER_INFO* mi, bool net_report); int stop_slave(THD* thd, MASTER_INFO* mi, bool net_report); bool change_master(THD* thd, MASTER_INFO* mi); -bool show_binlog_events(THD* thd); +bool mysql_show_binlog_events(THD* thd); int cmp_master_pos(const char* log_file_name1, ulonglong log_pos1, const char* log_file_name2, ulonglong log_pos2); int reset_slave(THD *thd, MASTER_INFO* mi); |