Commit 5f3c15c2 authored by Horst Hunger's avatar Horst Hunger
Browse files

Merge from parent.

parents c199b9d5 77507533

mysql-test/extra/rpl_tests/rpl_row_basic.test

+4 −0
Original line number Diff line number Diff line
@@ -354,6 +354,7 @@ CREATE TABLE t7 (i INT NOT NULL, 
connection master;

INSERT INTO t1 VALUES (1, "", 1);

INSERT INTO t1 VALUES (2, repeat(_utf8'a', 16), 2);

sync_slave_with_master;



let $diff_table_1=master:test.t1;

let $diff_table_2=slave:test.t1;
@@ -363,6 +364,7 @@ source include/diff_tables.inc; 
connection master;

INSERT INTO t2 VALUES (1, "", 1);

INSERT INTO t2 VALUES (2, repeat(_utf8'a', 16), 2);

sync_slave_with_master;



let $diff_table_1=master:test.t2;

let $diff_table_2=slave:test.t2;
@@ -387,6 +389,7 @@ source include/wait_for_slave_to_start.inc; 
connection master;

INSERT INTO t4 VALUES (1, "", 1);

INSERT INTO t4 VALUES (2, repeat(_utf8'a', 128), 2);

sync_slave_with_master;



let $diff_table_1=master:test.t4;

let $diff_table_2=slave:test.t4;
@@ -426,6 +429,7 @@ source include/wait_for_slave_to_start.inc; 
connection master;

INSERT INTO t7 VALUES (1, "", 1);

INSERT INTO t7 VALUES (2, repeat(_utf8'a', 255), 2);

sync_slave_with_master;



let $diff_table_1=master:test.t7;

let $diff_table_2=slave:test.t7;

mysql-test/suite/rpl/t/disabled.def

+1 −0
Original line number Diff line number Diff line
@@ -13,3 +13,4 @@ 
rpl_redirect               : Failure is sporadic and and the test is superfluous (mats)

rpl_innodb_bug28430        : Failure on Solaris Bug #36793

rpl_temporary              : BUG#38269 2008-07-21 Sven valgrind error in pushbuild

rpl_flushlog_loop          : BUG#37733 2008-07-23 Sven disabled in 5.1-bugteam. the bug has been fixed in 5.1-rpl: please re-enable when that gets pushed to main