List:Commits« Previous MessageNext Message »
From:Andrei Elkin Date:April 30 2008 6:41pm
Subject:bk commit into 5.1 tree (aelkin:1.2575) BUG#36435
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of aelkin.  When aelkin does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-04-30 21:41:50+03:00, aelkin@stripped +2 -0
  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@stripped, 2008-04-30 21:41:49+03:00, aelkin@stripped +7 -8
    changing verification to use a logical values instead of comparison with a pre-recorded
    results

  mysql-test/suite/rpl/r/rpl_events.result@stripped, 2008-04-30 21:41:49+03:00, aelkin@stripped +8 -20
    resutls updated.

diff -Nrup a/mysql-test/include/rpl_events.inc b/mysql-test/include/rpl_events.inc
--- a/mysql-test/include/rpl_events.inc	2007-08-10 00:18:31 +03:00
+++ b/mysql-test/include/rpl_events.inc	2008-04-30 21:41:49 +03:00
@@ -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';
diff -Nrup a/mysql-test/suite/rpl/r/rpl_events.result b/mysql-test/suite/rpl/r/rpl_events.result
--- a/mysql-test/suite/rpl/r/rpl_events.result	2008-02-14 11:52:59 +02:00
+++ b/mysql-test/suite/rpl/r/rpl_events.result	2008-04-30 21:41:49 +03:00
@@ -23,17 +23,11 @@ SELECT db, name, status, originator FROM
 db	name	status	originator
 test	justonce	ENABLED	1
 "Checking event data on the master"
-SELECT * FROM t1 ORDER BY id;
-id	c	ts
-1	manually	TIMESTAMP
-2	from justonce	TIMESTAMP
-affected rows: 2
+ONE
+1
 "Checking event data on the slave"
-SELECT * FROM t1 ORDER BY id;
-id	c	ts
-1	manually	TIMESTAMP
-2	from justonce	TIMESTAMP
-affected rows: 2
+ZERO
+0
 "Checking event is inactive on slave"
 SELECT db, name, status, originator FROM mysql.event WHERE db = 'test' AND name = 'justonce';
 db	name	status	originator
@@ -118,17 +112,11 @@ SELECT db, name, status, originator FROM
 db	name	status	originator
 test	justonce	ENABLED	1
 "Checking event data on the master"
-SELECT * FROM t1 ORDER BY id;
-id	c	ts
-1	manually	TIMESTAMP
-2	from justonce	TIMESTAMP
-affected rows: 2
+ONE
+1
 "Checking event data on the slave"
-SELECT * FROM t1 ORDER BY id;
-id	c	ts
-1	manually	TIMESTAMP
-2	from justonce	TIMESTAMP
-affected rows: 2
+ZERO
+0
 "Checking event is inactive on slave"
 SELECT db, name, status, originator FROM mysql.event WHERE db = 'test' AND name = 'justonce';
 db	name	status	originator
Thread
bk commit into 5.1 tree (aelkin:1.2575) BUG#36435Andrei Elkin30 Apr