Commit 695342d6 authored by gkodinov/kgeorge@magare.gmz's avatar gkodinov/kgeorge@magare.gmz
Browse files

Bug #19390: Test 'rpl_trigger' fails, might be random 

The checks in the test for bug #12480 were too wide and
made the test to depend on the procedures and triggers
present in the server.
Corrected the test to check only for the procedure and 
trigger it creates.
parent 977a189e

mysql-test/r/rpl_trigger.result

+8 −4
Original line number Diff line number Diff line
@@ -88,21 +88,25 @@ select a=b && a=c from t1; 
a=b && a=c

1

SELECT routine_name, definer

FROM information_schema.routines;

FROM information_schema.routines

WHERE routine_name = 'bug12480';

routine_name	definer

bug12480	root@localhost

SELECT trigger_name, definer

FROM information_schema.triggers;

FROM information_schema.triggers

WHERE trigger_name = 't1_first';

trigger_name	definer

t1_first	root@localhost



--- On slave --

SELECT routine_name, definer

FROM information_schema.routines;

FROM information_schema.routines

WHERE routine_name = 'bug12480';

routine_name	definer

bug12480	root@localhost

SELECT trigger_name, definer

FROM information_schema.triggers;

FROM information_schema.triggers

WHERE trigger_name = 't1_first';

trigger_name	definer

t1_first	root@localhost

select a=b && a=c from t1;

mysql-test/t/rpl_trigger.test

+8 −4
Original line number Diff line number Diff line
@@ -93,10 +93,12 @@ let $time=`select a from t1`; 
#   - dump definers on the slave;



SELECT routine_name, definer

FROM information_schema.routines;

FROM information_schema.routines

WHERE routine_name = 'bug12480';



SELECT trigger_name, definer

FROM information_schema.triggers;

FROM information_schema.triggers

WHERE trigger_name = 't1_first';



save_master_pos;

connection slave;
@@ -111,10 +113,12 @@ select "--- On slave --" as ""; 
# item.



SELECT routine_name, definer

FROM information_schema.routines;

FROM information_schema.routines

WHERE routine_name = 'bug12480';



SELECT trigger_name, definer

FROM information_schema.triggers;

FROM information_schema.triggers

WHERE trigger_name = 't1_first';



select a=b && a=c from t1;

--disable_query_log