Commit 5becb1e4 authored by unknown's avatar unknown

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
parent 20d871e5
...@@ -4,21 +4,21 @@ reset master; ...@@ -4,21 +4,21 @@ reset master;
reset slave; reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave; start slave;
create table t1 (a int); create table t1 (a int) ENGINE=MyISAM;
insert into t1 values (10); 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 t3 (a int) engine=merge union(t1);
create table t4 (a int); create table t4 (a int);
insert into t4 select * from t3; insert into t4 select * from t3;
rename table t1 to t5, t2 to t1; rename table t1 to t5, t2 to t1;
flush no_write_to_binlog tables; 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 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`; rename table t1 to t5, t2 to t1
select * from t3; select * from t3;
a a
flush tables; flush tables;
SHOW BINLOG EVENTS FROM 619 ; SHOW BINLOG EVENTS FROM 647 ;
Log_name Pos Event_type Server_id End_log_pos Info 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`; rename table t1 to t5, t2 to t1
master-bin.000001 # Query 1 # use `test`; flush tables master-bin.000001 # Query 1 # use `test`; flush tables
......
...@@ -11,7 +11,7 @@ USE mysqlslap; ...@@ -11,7 +11,7 @@ USE mysqlslap;
select @@global.binlog_format; select @@global.binlog_format;
@@global.binlog_format @@global.binlog_format
ROW 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; FLUSH TABLE t1;
SELECT COUNT(*) FROM t1; SELECT COUNT(*) FROM t1;
COUNT(*) COUNT(*)
......
# depends on the binlog output # depends on the binlog output
-- source include/have_binlog_format_row.inc -- 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 # 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 # The use of the ps protocol causes extra table maps in the binlog, so
......
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