summaryrefslogtreecommitdiff
path: root/mysql-test/include/rpl_events.inc
diff options
context:
space:
mode:
authorunknown <aelkin/andrei@mysql1000.dsl.inet.fi>2008-04-30 21:41:50 +0300
committerunknown <aelkin/andrei@mysql1000.dsl.inet.fi>2008-04-30 21:41:50 +0300
commit8cc540767d298af0e6fae6e8047e8cd4547e407a (patch)
treedc6ad3ac46e6cc2ef02a18f0b6c3de9242145433 /mysql-test/include/rpl_events.inc
parent368542d47b6fd2996d8a3eaf73f9c6f002b9b379 (diff)
downloadmariadb-git-8cc540767d298af0e6fae6e8047e8cd4547e407a.tar.gz
Bug #36435 rpl_events uses non-deterministic check
Select of the test could not perform deterministically, because the table remains to be updatable by the running event handler. Fixed with changing verification to use a logical values instead of comparison with a pre-recorded results. mysql-test/include/rpl_events.inc: changing verification to use a logical values instead of comparison with a pre-recorded results mysql-test/suite/rpl/r/rpl_events.result: resutls updated.
Diffstat (limited to 'mysql-test/include/rpl_events.inc')
-rw-r--r--mysql-test/include/rpl_events.inc15
1 files changed, 7 insertions, 8 deletions
diff --git a/mysql-test/include/rpl_events.inc b/mysql-test/include/rpl_events.inc
index e1bf5500923..34ceba81a38 100644
--- a/mysql-test/include/rpl_events.inc
+++ b/mysql-test/include/rpl_events.inc
@@ -41,18 +41,17 @@ let $wait_condition=
# check that table t1 contains something
--echo "Checking event data on the master"
---enable_info
---replace_column 3 TIMESTAMP
-SELECT * FROM t1 ORDER BY id;
---disable_info
+let $events_done=`SELECT count(*) FROM t1 id`;
+--disable_query_log
+eval SELECT $events_done > 0 as ONE;
+--enable_query_log
sync_slave_with_master;
--echo "Checking event data on the slave"
---enable_info
---replace_column 3 TIMESTAMP
-SELECT * FROM t1 ORDER BY id;
---disable_info
+--disable_query_log
+eval SELECT count(*) - $events_done as ZERO FROM t1 id;
+--enable_query_log
--echo "Checking event is inactive on slave"
SELECT db, name, status, originator FROM mysql.event WHERE db = 'test' AND name = 'justonce';