1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt

Browse Source 
into  magare.gmz:/home/kgeorge/mysql/autopush/B19390-5.0-opt
This commit is contained in:
gkodinov/kgeorge@magare.gmz 2007-12-18 10:45:05 +02:00
commit 1a8b8eb91c
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mysql-test/r/rpl_trigger.result
View File

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

12
mysql-test/t/rpl_trigger.test
View File

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