bk commit into 5.0 tree (gkodinov:1.2589) BUG#19390

[kgeorge]

Below is the list of changes that have just been committed into a local
5.0 repository of kgeorge. When kgeorge does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-12-17 18:56:39+02:00, gkodinov@stripped +2 -0
  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.

  mysql-test/r/rpl_trigger.result@stripped, 2007-12-17 18:56:38+02:00, gkodinov@stripped +8
-4
    Bug #19390: corrected the test to check for its procedure only

  mysql-test/t/rpl_trigger.test@stripped, 2007-12-17 18:56:38+02:00, gkodinov@stripped +8 -4
    Bug #19390: corrected the test to check for its procedure only

diff -Nrup a/mysql-test/r/rpl_trigger.result b/mysql-test/r/rpl_trigger.result
--- a/mysql-test/r/rpl_trigger.result	2006-11-14 00:38:34 +02:00
+++ b/mysql-test/r/rpl_trigger.result	2007-12-17 18:56:38 +02:00
@@ -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;
diff -Nrup a/mysql-test/t/rpl_trigger.test b/mysql-test/t/rpl_trigger.test
--- a/mysql-test/t/rpl_trigger.test	2006-11-14 00:38:34 +02:00
+++ b/mysql-test/t/rpl_trigger.test	2007-12-17 18:56:38 +02:00
@@ -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