diff options
| author | unknown <guilhem@gbichot4.local> | 2007-09-12 15:10:41 +0200 |
|---|---|---|
| committer | unknown <guilhem@gbichot4.local> | 2007-09-12 15:10:41 +0200 |
| commit | 5becb1e4040884cde2f6537db7c3daef0b5e5eb9 (patch) | |
| tree | 085b27a1c7632d8faca42d50416682d6ac93a30e /mysql-test | |
| parent | 20d871e5de798e5f12db39fab6194ceb6e526e42 (diff) | |
| download | mariadb-git-5becb1e4040884cde2f6537db7c3daef0b5e5eb9.tar.gz | |
fix for pushbuild test failures
mysql-test/r/rpl_row_flsh_tbls.result:
result update
mysql-test/r/rpl_row_insert_delayed.result:
result update
mysql-test/t/rpl_row_flsh_tbls.test:
CREATE TABLE statement got an ENGINE clause so became longer
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/rpl_row_flsh_tbls.result | 8 | ||||
| -rw-r--r-- | mysql-test/r/rpl_row_insert_delayed.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/rpl_row_flsh_tbls.test | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/mysql-test/r/rpl_row_flsh_tbls.result b/mysql-test/r/rpl_row_flsh_tbls.result index 942a6b83bf6..b2fd110973f 100644 --- a/mysql-test/r/rpl_row_flsh_tbls.result +++ b/mysql-test/r/rpl_row_flsh_tbls.result @@ -4,21 +4,21 @@ reset master; reset slave; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; start slave; -create table t1 (a int); +create table t1 (a int) ENGINE=MyISAM; insert into t1 values (10); -create table t2 (a int); +create table t2 (a int) ENGINE=MyISAM; create table t3 (a int) engine=merge union(t1); create table t4 (a int); insert into t4 select * from t3; rename table t1 to t5, t2 to t1; flush no_write_to_binlog tables; -SHOW BINLOG EVENTS FROM 619 ; +SHOW BINLOG EVENTS FROM 647 ; Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query 1 # use `test`; rename table t1 to t5, t2 to t1 select * from t3; a flush tables; -SHOW BINLOG EVENTS FROM 619 ; +SHOW BINLOG EVENTS FROM 647 ; Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query 1 # use `test`; rename table t1 to t5, t2 to t1 master-bin.000001 # Query 1 # use `test`; flush tables diff --git a/mysql-test/r/rpl_row_insert_delayed.result b/mysql-test/r/rpl_row_insert_delayed.result index 2044672f49d..bec410cc3fa 100644 --- a/mysql-test/r/rpl_row_insert_delayed.result +++ b/mysql-test/r/rpl_row_insert_delayed.result @@ -11,7 +11,7 @@ USE mysqlslap; select @@global.binlog_format; @@global.binlog_format ROW -CREATE TABLE t1 (id INT primary key auto_increment, name VARCHAR(64)); +CREATE TABLE t1 (id INT primary key auto_increment, name VARCHAR(64)) ENGINE=MyISAM; FLUSH TABLE t1; SELECT COUNT(*) FROM t1; COUNT(*) diff --git a/mysql-test/t/rpl_row_flsh_tbls.test b/mysql-test/t/rpl_row_flsh_tbls.test index a2f9e31fc5d..b96bb50b3cc 100644 --- a/mysql-test/t/rpl_row_flsh_tbls.test +++ b/mysql-test/t/rpl_row_flsh_tbls.test @@ -1,7 +1,7 @@ # depends on the binlog output -- source include/have_binlog_format_row.inc -let $rename_event_pos= 619; +let $rename_event_pos= 647; # Bug#18326: Do not lock table for writing during prepare of statement # The use of the ps protocol causes extra table maps in the binlog, so |