From 5eb809670006f6dc108eb5f80d2219c098cc01d6 Mon Sep 17 00:00:00 2001
From: "cbell/Chuck@mysql_cab_desk." <>
Date: Fri, 30 Mar 2007 12:16:48 -0400
Subject: [PATCH] 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/include/rpl_events.inc | 4 ++--
 mysql-test/r/rpl_events.result    | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/mysql-test/include/rpl_events.inc b/mysql-test/include/rpl_events.inc
index d94a69ad60d..04885f31997 100644
--- a/mysql-test/include/rpl_events.inc
+++ b/mysql-test/include/rpl_events.inc
@@ -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';
diff --git a/mysql-test/r/rpl_events.result b/mysql-test/r/rpl_events.result
index 1233ab1b9d2..bff1a814a6d 100644
--- a/mysql-test/r/rpl_events.result
+++ b/mysql-test/r/rpl_events.result
@@ -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