Bug #44331 Restore of database with events produces warning in replication

Update the test case for BUG#44331 to fix the push build failure.

mysql-test/suite/rpl/r/rpl_events.result

@@ -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;

mysql-test/suite/rpl/t/rpl_events.test

@@ -76,15 +76,25 @@ CREATE /*!50000 DEFINER='user44331' */ EVENT event44331_4
 
 --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;