diff options
| author | unknown <aelkin@dl145j.mysql.com> | 2007-12-12 20:12:29 +0100 |
|---|---|---|
| committer | unknown <aelkin@dl145j.mysql.com> | 2007-12-12 20:12:29 +0100 |
| commit | 32c5d070dd49943f6f2510846ba2c8a6a6f5510d (patch) | |
| tree | cf956ce770da6b5b056a1fa9984e10f905c9e090 /mysql-test/suite/rpl/t/rpl_ignore_table.test | |
| parent | 230f589f51ae1696443fffddd24f481d201fdef2 (diff) | |
| download | mariadb-git-32c5d070dd49943f6f2510846ba2c8a6a6f5510d.tar.gz | |
bug#31552 manual merge and post-make-test-run changes.
mysql-test/extra/rpl_tests/rpl_row_basic.test:
changes due to the strict mode gets default. This hunk is being added after merging
with changes from another bug fixes.
mysql-test/suite/rpl/r/rpl_ignore_table.result:
results changed
mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result:
results changed
mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result:
results changed
mysql-test/suite/rpl/t/rpl_ignore_table.test:
two queries on mysql db tables are replicated according to binlog_format, ie
in row-based when that is requested. Due to cancelling the idempotent default
row based events that previously exectuted successfully now stop the slave sql
thread.
We have to explicitly request the idempotent slave execution mode.
mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_advance.result:
results changed. They are being committed only now since there was another
bug which fixes my working clone did not have.
mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result:
results changed
sql/log_event.cc:
typo in manual merge earlier
Diffstat (limited to 'mysql-test/suite/rpl/t/rpl_ignore_table.test')
| -rw-r--r-- | mysql-test/suite/rpl/t/rpl_ignore_table.test | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/mysql-test/suite/rpl/t/rpl_ignore_table.test b/mysql-test/suite/rpl/t/rpl_ignore_table.test index fd4ae64165a..7f13b16b0de 100644 --- a/mysql-test/suite/rpl/t/rpl_ignore_table.test +++ b/mysql-test/suite/rpl/t/rpl_ignore_table.test @@ -119,6 +119,13 @@ show grants for mysqltest3@localhost; show grants for mysqltest4@localhost; # Cleanup +# connection slave; +# BUG31552 changes idempotency is not default any longer +# In order the following `delete from mysql.user', +# where mysqltest1 does not exist on slave, +# to succeed on slave the mode is temporarily changed +set global slave_exec_mode='IDEMPOTENT'; + connection master; drop table t1, t4, mysqltest2.t2; drop database mysqltest2; @@ -129,7 +136,10 @@ delete from mysql.db where user like "mysqltest%"; # move it to slave instead #delete from mysql.tables_priv where user like "mysqltest%"; delete from mysql.columns_priv where user like "mysqltest%"; + sync_slave_with_master; +# bug#31552: do not restore the mode here but later in order +# to succeed with yet the following delete from mysql.tables_priv #BUG27606 delete from mysql.tables_priv where user like "mysqltest%"; @@ -155,6 +165,7 @@ CREATE TEMPORARY TABLE tmptbl504451f4258$1 (id INT NOT NULL) ENGINE=MEMORY; INSERT INTO t5 (word) VALUES ('TEST’'); SELECT HEX(word) FROM t5; sync_slave_with_master; +set @@global.slave_exec_mode= default; # bug#31552 comments above connection slave; SELECT HEX(word) FROM t5; --error 1146 |