diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-12-15 14:16:15 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-12-15 20:25:06 +0100 |
| commit | 2116649dee20a9e3ce63468f2b85442292f5c826 (patch) | |
| tree | 7a862cd81c22bbf4c1803993365a5568cddee28c /mysql-test/extra | |
| parent | 7a2136433280fa5c38997bbd4b41121b8e727ca0 (diff) | |
| download | mariadb-git-2116649dee20a9e3ce63468f2b85442292f5c826.tar.gz | |
after-merge fix replication tests
* mostly update result files
* also updating test/include files to match 5.6
Diffstat (limited to 'mysql-test/extra')
| -rw-r--r-- | mysql-test/extra/rpl_tests/rpl_record_compare.test | 21 | ||||
| -rw-r--r-- | mysql-test/extra/rpl_tests/rpl_row_basic.test | 4 | ||||
| -rw-r--r-- | mysql-test/extra/rpl_tests/rpl_sv_relay_space.test | 3 |
3 files changed, 4 insertions, 24 deletions
diff --git a/mysql-test/extra/rpl_tests/rpl_record_compare.test b/mysql-test/extra/rpl_tests/rpl_record_compare.test index 210aee025d0..b674b76dfdf 100644 --- a/mysql-test/extra/rpl_tests/rpl_record_compare.test +++ b/mysql-test/extra/rpl_tests/rpl_record_compare.test @@ -62,24 +62,3 @@ UPDATE t1 SET c1= 0; DROP TABLE t1; -- sync_slave_with_master -# -# BUG#11766865: 60091: RBR + NO PK + UPDATE NULL VALUE --> SLAVE BREAK WITH ERROR HA_ERR_END_OF_ -# - ---connection master ---source include/rpl_reset.inc ---connection master - ---eval CREATE TABLE t1 (c1 int(11) NOT NULL, c2 int(11) NOT NULL, c3 int(11) DEFAULT '-1') ENGINE=$engine DEFAULT CHARSET=latin1 - -INSERT INTO t1 VALUES (1,2,NULL); -UPDATE t1 SET c1=1, c2=2, c3=-1 WHERE c1=1 AND c2=2 AND ISNULL(c3); - ---sync_slave_with_master - ---let $diff_tables=master:test.t1, slave:test.t1 ---source include/diff_tables.inc - ---connection master -DROP TABLE t1; ---sync_slave_with_master diff --git a/mysql-test/extra/rpl_tests/rpl_row_basic.test b/mysql-test/extra/rpl_tests/rpl_row_basic.test index 8ce45505c46..da8787d22f2 100644 --- a/mysql-test/extra/rpl_tests/rpl_row_basic.test +++ b/mysql-test/extra/rpl_tests/rpl_row_basic.test @@ -440,7 +440,7 @@ INSERT INTO t5 VALUES (2, repeat(_utf8'a', 255), 2); connection slave; # 1677 = ER_SLAVE_CONVERSION_FAILED ---let $slave_sql_errno= 1677 +--let $slave_sql_errno= 1677 --let $show_slave_sql_error= 1 --source include/wait_for_slave_sql_error.inc @@ -453,7 +453,7 @@ INSERT INTO t6 VALUES (2, repeat(_utf8'a', 255), 2); connection slave; # 1677 = ER_SLAVE_CONVERSION_FAILED ---let $slave_sql_errno= 1677 +--let $slave_sql_errno= 1677 --let $show_slave_sql_error= 1 --source include/wait_for_slave_sql_error.inc diff --git a/mysql-test/extra/rpl_tests/rpl_sv_relay_space.test b/mysql-test/extra/rpl_tests/rpl_sv_relay_space.test index 1687a233914..868b8e73d0a 100644 --- a/mysql-test/extra/rpl_tests/rpl_sv_relay_space.test +++ b/mysql-test/extra/rpl_tests/rpl_sv_relay_space.test @@ -15,7 +15,8 @@ eval CREATE TABLE t1 (name varchar(64), age smallint(3))ENGINE=$engine_type; INSERT INTO t1 SET name='Andy', age=31; INSERT INTO t1 SET name='Jacob', age=2; INSERT INTO t1 SET name='Caleb', age=1; -ALTER TABLE t1 ADD id int(8) ZEROFILL AUTO_INCREMENT PRIMARY KEY; +ALTER TABLE t1 ADD id int(8) ZEROFILL AUTO_INCREMENT PRIMARY KEY, + ALGORITHM=COPY; SELECT * FROM t1 ORDER BY id; sync_slave_with_master; SELECT * FROM t1 ORDER BY id; |