List:Commits« Previous MessageNext Message »
From:Dao-Gang.Qu Date:August 31 2009 2:41am
Subject:bzr commit into mysql-5.4 branch (Dao-Gang.Qu:3565) Bug#44331
View as plain text  
#At file:///home/daogangqu/mysql/bzrwork/bug44331/mysql-pe/ based on revid:staale.smedseng@stripped

 3565 Dao-Gang.Qu@stripped	2009-08-31 [merge]
      Bug #44331  Restore of database with events produces warning in replication
      
      Update the test case for BUG#44331 to fix the push build failure.

    modified:
      mysql-test/suite/rpl/r/rpl_events.result
      mysql-test/suite/rpl/t/rpl_events.test
=== modified file 'mysql-test/suite/rpl/r/rpl_events.result'
--- a/mysql-test/suite/rpl/r/rpl_events.result	2009-08-29 18:24:59 +0000
+++ b/mysql-test/suite/rpl/r/rpl_events.result	2009-08-31 02:40:14 +0000
@@ -212,21 +212,37 @@ Warnings:
 Note	1449	The user specified as a definer ('user44331'@'%') does not exist
 #on master 
 select EVENT_SCHEMA, EVENT_NAME, DEFINER from information_schema.events
-where EVENT_NAME='event44331_1' || EVENT_NAME='event44331_2' || 
-EVENT_NAME='event44331_3' || EVENT_NAME='event44331_4';
+where EVENT_NAME='event44331_1';
 EVENT_SCHEMA	EVENT_NAME	DEFINER
 test	event44331_1	root@localhost
+select EVENT_SCHEMA, EVENT_NAME, DEFINER from information_schema.events
+where EVENT_NAME='event44331_2';
+EVENT_SCHEMA	EVENT_NAME	DEFINER
 test	event44331_2	root@localhost
+select EVENT_SCHEMA, EVENT_NAME, DEFINER from information_schema.events
+where EVENT_NAME='event44331_3';
+EVENT_SCHEMA	EVENT_NAME	DEFINER
 test	event44331_3	root@localhost
+select EVENT_SCHEMA, EVENT_NAME, DEFINER from information_schema.events
+where EVENT_NAME='event44331_4';
+EVENT_SCHEMA	EVENT_NAME	DEFINER
 test	event44331_4	user44331@%
 #on slave
 select EVENT_SCHEMA, EVENT_NAME, DEFINER from information_schema.events
-where EVENT_NAME='event44331_1' || EVENT_NAME='event44331_2' || 
-EVENT_NAME='event44331_3' || EVENT_NAME='event44331_4';
+where EVENT_NAME='event44331_1';
 EVENT_SCHEMA	EVENT_NAME	DEFINER
 test	event44331_1	root@localhost
+select EVENT_SCHEMA, EVENT_NAME, DEFINER from information_schema.events
+where EVENT_NAME='event44331_2';
+EVENT_SCHEMA	EVENT_NAME	DEFINER
 test	event44331_2	root@localhost
+select EVENT_SCHEMA, EVENT_NAME, DEFINER from information_schema.events
+where EVENT_NAME='event44331_3';
+EVENT_SCHEMA	EVENT_NAME	DEFINER
 test	event44331_3	root@localhost
+select EVENT_SCHEMA, EVENT_NAME, DEFINER from information_schema.events
+where EVENT_NAME='event44331_4';
+EVENT_SCHEMA	EVENT_NAME	DEFINER
 test	event44331_4	user44331@%
 SET @@global.event_scheduler= @old_event_scheduler;
 DROP TABLE t28953;

=== modified file 'mysql-test/suite/rpl/t/rpl_events.test'
--- a/mysql-test/suite/rpl/t/rpl_events.test	2009-08-29 18:24:59 +0000
+++ b/mysql-test/suite/rpl/t/rpl_events.test	2009-08-31 02:40:14 +0000
@@ -76,15 +76,25 @@ CREATE /*!50000 DEFINER='user44331' */ E
 
 --echo #on master 
 select EVENT_SCHEMA, EVENT_NAME, DEFINER from information_schema.events
-  where EVENT_NAME='event44331_1' || EVENT_NAME='event44331_2' || 
-        EVENT_NAME='event44331_3' || EVENT_NAME='event44331_4';
+  where EVENT_NAME='event44331_1';
+select EVENT_SCHEMA, EVENT_NAME, DEFINER from information_schema.events
+  where EVENT_NAME='event44331_2';
+select EVENT_SCHEMA, EVENT_NAME, DEFINER from information_schema.events
+  where EVENT_NAME='event44331_3';
+select EVENT_SCHEMA, EVENT_NAME, DEFINER from information_schema.events
+  where EVENT_NAME='event44331_4';
 
 sync_slave_with_master;
 connection slave;
 --echo #on slave
 select EVENT_SCHEMA, EVENT_NAME, DEFINER from information_schema.events
-  where EVENT_NAME='event44331_1' || EVENT_NAME='event44331_2' || 
-        EVENT_NAME='event44331_3' || EVENT_NAME='event44331_4';
+  where EVENT_NAME='event44331_1';
+select EVENT_SCHEMA, EVENT_NAME, DEFINER from information_schema.events
+  where EVENT_NAME='event44331_2';
+select EVENT_SCHEMA, EVENT_NAME, DEFINER from information_schema.events
+  where EVENT_NAME='event44331_3';
+select EVENT_SCHEMA, EVENT_NAME, DEFINER from information_schema.events
+  where EVENT_NAME='event44331_4';
 
 connection master;
 SET @@global.event_scheduler= @old_event_scheduler;


Attachment: [text/bzr-bundle] bzr/dao-gang.qu@sun.com-20090831024014-rf5ai3nplt9vickn.bundle
Thread
bzr commit into mysql-5.4 branch (Dao-Gang.Qu:3565) Bug#44331Dao-Gang.Qu31 Aug