diff options
| author | mats@romeo.(none) <> | 2007-03-22 09:05:11 +0100 |
|---|---|---|
| committer | mats@romeo.(none) <> | 2007-03-22 09:05:11 +0100 |
| commit | 68ebc7e49577a5e447cc1a1f66566282d7c5c7da (patch) | |
| tree | 95f7524f2b6c4cbacd479d5c251d41b542a2b26f /sql/slave.h | |
| parent | 11d37efa5e117c5f64870a00ec56b438b7e4dca9 (diff) | |
| parent | 2ee007ba9d0eb8517a43d767bf2ec4b7fcdad5ad (diff) | |
| download | mariadb-git-68ebc7e49577a5e447cc1a1f66566282d7c5c7da.tar.gz | |
Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl
into romeo.(none):/home/bk/b23171-mysql-5.1-new-rpl
Diffstat (limited to 'sql/slave.h')
| -rw-r--r-- | sql/slave.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/slave.h b/sql/slave.h index f21266bbee4..107b74c09dd 100644 --- a/sql/slave.h +++ b/sql/slave.h @@ -162,9 +162,9 @@ bool show_binlog_info(THD* thd); bool rpl_master_has_bug(RELAY_LOG_INFO *rli, uint bug_id); const char *print_slave_db_safe(const char *db); -int check_expected_error(THD* thd, RELAY_LOG_INFO* rli, int error_code); +int check_expected_error(THD* thd, RELAY_LOG_INFO const *rli, int error_code); void skip_load_data_infile(NET* net); -void slave_print_msg(enum loglevel level, RELAY_LOG_INFO* rli, +void slave_print_msg(enum loglevel level, RELAY_LOG_INFO const *rli, int err_code, const char* msg, ...) ATTRIBUTE_FORMAT(printf, 4, 5); @@ -182,7 +182,7 @@ 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); void set_slave_thread_options(THD* thd); -void set_slave_thread_default_charset(THD* thd, RELAY_LOG_INFO *rli); +void set_slave_thread_default_charset(THD *thd, RELAY_LOG_INFO const *rli); void rotate_relay_log(MASTER_INFO* mi); pthread_handler_t handle_slave_io(void *arg); |