diff options
| author | unknown <guilhem@gbichot3.local> | 2007-03-22 17:32:37 +0100 |
|---|---|---|
| committer | unknown <guilhem@gbichot3.local> | 2007-03-22 17:32:37 +0100 |
| commit | 11aa04c993280023f46728f3ee57bf22a9adbb50 (patch) | |
| tree | 72e2fbc67cc8bf23b5f05c4b6d4758887146a88c /sql/slave.h | |
| parent | 8ceea7c4760ab5aa67d0604acc8a4e4ab6c04475 (diff) | |
| parent | 09f3dda77d734e9602c3c22e4928dfa71f010caf (diff) | |
| download | mariadb-git-11aa04c993280023f46728f3ee57bf22a9adbb50.tar.gz | |
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl
into gbichot3.local:/home/mysql_src/mysql-5.1-rpl-26194
sql/log_event.cc:
Auto merged
sql/log_event.h:
Auto merged
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); |