Commit 556155c2 authored by unknown's avatar unknown

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
parent e3d9ea2d
......@@ -11352,3 +11352,4 @@ col1
a
a
a
drop table t1;
......@@ -42,3 +42,4 @@ rpl_sp : Bug#16456
rpl_until : Unstable test case, bug#15886
sp-goto : GOTO is currently is disabled - will be fixed in the future
rpl_ndb_multi_update2 : BUG#17738 In progress
rpl_rbr_to_sbr : BUG#18108
......@@ -147,6 +147,8 @@ select * from t1 where a="alarm";
# and now compare:
--replace_column 2 # 5 #
--replace_regex /table_id: [0-9]+/table_id: #/
show binlog events from 102;
sync_slave_with_master;
# as we're using UUID we don't SELECT but use "diff" like in rpl_row_UUID
......
......@@ -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"));
}
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment