Commit e950594e authored by unknown's avatar unknown
Browse files

This patch includes modification to the rpl_events test to limit 

the SELECT in the test to only the expected rows. This helps
eliminate the possibility of spurious rows causing the test to
fail.


mysql-test/r/rpl_events.result:
  This patch modifies the test results to match the new SELECT for test
  results.
parent bfc73f2c

mysql-test/include/rpl_events.inc

+2 −2
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ SELECT db, name, status, originator FROM mysql.event WHERE db = 'test' AND name 
--echo "in the master"

--enable_info

--replace_column 3 TIMESTAMP

SELECT * FROM t1;

SELECT * FROM t1 WHERE c = 'from justonce' OR c = 'manually' ORDER BY id;

--disable_info



sync_slave_with_master;
@@ -42,7 +42,7 @@ sync_slave_with_master; 
--echo "in the slave"

--enable_info

--replace_column 3 TIMESTAMP

SELECT * FROM t1;

SELECT * FROM t1 WHERE c = 'from justonce' OR c = 'manually' ORDER BY id;

--disable_info



SELECT db, name, status, originator FROM mysql.event WHERE db = 'test' AND name = 'justonce';

mysql-test/r/rpl_events.result

+4 −4
Original line number Diff line number Diff line
@@ -21,13 +21,13 @@ SELECT db, name, status, originator FROM mysql.event WHERE db = 'test' AND name 
db	name	status	originator

test	justonce	ENABLED	1

"in the master"

SELECT * FROM t1;

SELECT * FROM t1 WHERE c = 'from justonce' OR c = 'manually' ORDER BY id;

id	c	ts

1	manually	TIMESTAMP

2	from justonce	TIMESTAMP

affected rows: 2

"in the slave"

SELECT * FROM t1;

SELECT * FROM t1 WHERE c = 'from justonce' OR c = 'manually' ORDER BY id;

id	c	ts

1	manually	TIMESTAMP

2	from justonce	TIMESTAMP
@@ -98,13 +98,13 @@ SELECT db, name, status, originator FROM mysql.event WHERE db = 'test' AND name 
db	name	status	originator

test	justonce	ENABLED	1

"in the master"

SELECT * FROM t1;

SELECT * FROM t1 WHERE c = 'from justonce' OR c = 'manually' ORDER BY id;

id	c	ts

1	manually	TIMESTAMP

2	from justonce	TIMESTAMP

affected rows: 2

"in the slave"

SELECT * FROM t1;

SELECT * FROM t1 WHERE c = 'from justonce' OR c = 'manually' ORDER BY id;

id	c	ts

1	manually	TIMESTAMP

2	from justonce	TIMESTAMP