diff options
| author | unknown <lars@mysql.com> | 2006-03-09 15:59:29 +0100 |
|---|---|---|
| committer | unknown <lars@mysql.com> | 2006-03-09 15:59:29 +0100 |
| commit | 556155c2b41a3408f1d042f102be0ad75206470b (patch) | |
| tree | 2c67ba4918622e9ea3e5daaa46669ad34ba2d978 /sql/handler.cc | |
| parent | e3d9ea2d671fa5c1f8beb7a2ff661053e627f815 (diff) | |
| download | mariadb-git-556155c2b41a3408f1d042f102be0ad75206470b.tar.gz | |
Fix to not replicate mysql.event table
Test fixes
mysql-test/r/binlog_stm_ctype_cp932.result:
Fixed result file
mysql-test/r/rpl_switch_stm_row_mixed.result:
Fixed result file
mysql-test/t/disabled.def:
Disabled test case
mysql-test/t/rpl_switch_stm_row_mixed.test:
Fix test
sql/handler.cc:
Fix to not replicate mysql.event table
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index 7305a376730..76c3ebd3387 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -3142,6 +3142,7 @@ bool ha_show_status(THD *thd, handlerton *db_type, enum ha_stat_type stat) - It is not a temporary table - The binary log is open - The database the table resides in shall be binlogged (binlog_*_db rules) + - table is not mysql.event */ #ifdef HAVE_ROW_BASED_REPLICATION @@ -3156,7 +3157,9 @@ namespace { thd && (thd->options & OPTION_BIN_LOG) && (table->s->tmp_table == NO_TMP_TABLE) && mysql_bin_log.is_open() && - binlog_filter->db_ok(table->s->db.str); + binlog_filter->db_ok(table->s->db.str) && + (strcmp(table->s->db.str, "mysql") || + strcmp(table->s->table_name.str, "event")); } } |