diff options
| author | unknown <lars/lthalmann@dl145h.mysql.com> | 2007-02-24 11:52:08 +0100 |
|---|---|---|
| committer | unknown <lars/lthalmann@dl145h.mysql.com> | 2007-02-24 11:52:08 +0100 |
| commit | 2a86b8ecfc0e93853b9a31c8c818048f8a153137 (patch) | |
| tree | 74216a789ffa49f90ad3de222b70c50b2477b271 /sql/slave.h | |
| parent | 61587c18639f4dfeb4e30e490c8b7785341c1eb5 (diff) | |
| parent | 6f6951d21867a2d71de414d21becf55feb3792b1 (diff) | |
| download | mariadb-git-2a86b8ecfc0e93853b9a31c8c818048f8a153137.tar.gz | |
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
client/mysqlbinlog.cc:
Auto merged
include/my_global.h:
Auto merged
mysql-test/extra/rpl_tests/rpl_insert_id.test:
Auto merged
mysql-test/t/show_check.test:
Auto merged
mysys/mf_iocache2.c:
Auto merged
sql/field.cc:
Auto merged
sql/item_xmlfunc.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/slave.h:
Auto merged
sql/sql_show.cc:
Auto merged
mysql-test/t/disabled.def:
Manual merge
sql/log.cc:
Manual merge
sql/sql_insert.cc:
Manual merge
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 bc039f6eb75..f21266bbee4 100644 --- a/sql/slave.h +++ b/sql/slave.h @@ -159,6 +159,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); |