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
...@@ -88,21 +88,25 @@ select a=b && a=c from t1; ...@@ -88,21 +88,25 @@ select a=b && a=c from t1;
a=b && a=c a=b && a=c
1 1
SELECT routine_name, definer SELECT routine_name, definer
FROM information_schema.routines; FROM information_schema.routines
WHERE routine_name = 'bug12480';
routine_name definer routine_name definer
bug12480 root@localhost bug12480 root@localhost
SELECT trigger_name, definer SELECT trigger_name, definer
FROM information_schema.triggers; FROM information_schema.triggers
WHERE trigger_name = 't1_first';
trigger_name definer trigger_name definer
t1_first root@localhost t1_first root@localhost
--- On slave -- --- On slave --
SELECT routine_name, definer SELECT routine_name, definer
FROM information_schema.routines; FROM information_schema.routines
WHERE routine_name = 'bug12480';
routine_name definer routine_name definer
bug12480 root@localhost bug12480 root@localhost
SELECT trigger_name, definer SELECT trigger_name, definer
FROM information_schema.triggers; FROM information_schema.triggers
WHERE trigger_name = 't1_first';
trigger_name definer trigger_name definer
t1_first root@localhost t1_first root@localhost
select a=b && a=c from t1; select a=b && a=c from t1;
......
...@@ -93,10 +93,12 @@ let $time=`select a from t1`; ...@@ -93,10 +93,12 @@ let $time=`select a from t1`;
# - dump definers on the slave; # - dump definers on the slave;
SELECT routine_name, definer SELECT routine_name, definer
FROM information_schema.routines; FROM information_schema.routines
WHERE routine_name = 'bug12480';
SELECT trigger_name, definer SELECT trigger_name, definer
FROM information_schema.triggers; FROM information_schema.triggers
WHERE trigger_name = 't1_first';
save_master_pos; save_master_pos;
connection slave; connection slave;
...@@ -111,10 +113,12 @@ select "--- On slave --" as ""; ...@@ -111,10 +113,12 @@ select "--- On slave --" as "";
# item. # item.
SELECT routine_name, definer SELECT routine_name, definer
FROM information_schema.routines; FROM information_schema.routines
WHERE routine_name = 'bug12480';
SELECT trigger_name, definer SELECT trigger_name, definer
FROM information_schema.triggers; FROM information_schema.triggers
WHERE trigger_name = 't1_first';
select a=b && a=c from t1; select a=b && a=c from t1;
--disable_query_log --disable_query_log
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment