diff options
| author | unknown <guilhem@gbichot3.local> | 2007-02-15 16:05:22 +0100 |
|---|---|---|
| committer | unknown <guilhem@gbichot3.local> | 2007-02-15 16:05:22 +0100 |
| commit | 3ecd96ee97840542d374b35878a46794d0d507d9 (patch) | |
| tree | 740183d99797b55429ba0e91cff17c165bc6557e /sql/slave.h | |
| parent | fa22d34ea2ffb74409569df0525ac5c22d4ddc0d (diff) | |
| parent | 9dfb1d9011cf5b31d139d3904a0bf3afae91ad24 (diff) | |
| download | mariadb-git-3ecd96ee97840542d374b35878a46794d0d507d9.tar.gz | |
Merge gbichot3.local:/home/mysql_src/mysql-5.0-rpl-25507
into gbichot3.local:/home/mysql_src/mysql-5.1-rpl-25507
mysql-test/r/rpl_insert_id.result:
Auto merged
sql/log.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/slave.h:
Auto merged
mysql-test/t/rpl_insert_id.test:
will merge by hand
sql/sql_insert.cc:
will fix by hand
Diffstat (limited to 'sql/slave.h')
| -rw-r--r-- | sql/slave.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/slave.h b/sql/slave.h index 43eb71be601..a0febe3fd73 100644 --- a/sql/slave.h +++ b/sql/slave.h @@ -161,6 +161,7 @@ int fetch_master_table(THD* thd, const char* db_name, const char* table_name, bool show_master_info(THD* thd, MASTER_INFO* mi); 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); |