bk commit into 5.0 tree (gbichot:1.1917)

[guilhem]

Below is the list of changes that have just been committed into a local
5.0 repository of gbichot. When gbichot 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
  1.1917 05/05/05 18:28:54 gbichot@stripped +2 -0
  making rpl_sp.test hostname-independent

  mysql-test/r/rpl_sp.result
    1.2 05/05/05 18:27:23 gbichot@stripped +2 -2
    result update

  mysql-test/t/rpl_sp.test
    1.2 05/05/05 18:26:55 gbichot@stripped +4 -3
    making test hostname-independent (don't know why the problem didn't appear on my
machine)

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	gbichot
# Host:	quadita2.mysql.com
# Root:	/nfstmp1/guilhem/mysql-5.0-4ita

--- 1.1/mysql-test/r/rpl_sp.result	2005-05-05 14:20:47 +02:00
+++ 1.2/mysql-test/r/rpl_sp.result	2005-05-05 18:27:23 +02:00
@@ -106,7 +106,7 @@
 insert into t1 values (5);
 end|
 call foo4();
-ERROR 42000: INSERT command denied to user 'zedjzlcsjhd'@'localhost' for table 't1'
+Got one of the listed errors
 show warnings;
 Level	Code	Message
 Warning	1417	A routine failed and is declared to modify data and binary logging is
enabled; if non-transactional tables were updated, the binary log will miss their changes
@@ -114,7 +114,7 @@
 show warnings;
 Level	Code	Message
 call foo4();
-ERROR 42000: INSERT command denied to user 'zedjzlcsjhd'@'localhost' for table 't1'
+Got one of the listed errors
 show warnings;
 Level	Code	Message
 Warning	1417	A routine failed and is declared to modify data and binary logging is
enabled; if non-transactional tables were updated, the binary log will miss their changes

--- 1.1/mysql-test/t/rpl_sp.test	2005-05-05 14:20:48 +02:00
+++ 1.2/mysql-test/t/rpl_sp.test	2005-05-05 18:26:55 +02:00
@@ -125,8 +125,9 @@
 
 delimiter ;|
 
---replace_result localhost.localdomain localhost 127.0.0.1 localhost
---error 1142;
+# I add ,0 so that it does not print the error in the test output,
+# because this error is hostname-dependent
+--error 1142,0;
 call foo4(); # invoker has no INSERT grant on table => failure
 show warnings;
 
@@ -135,7 +136,7 @@
 show warnings;
 
 --replace_result localhost.localdomain localhost 127.0.0.1 localhost
---error 1142;
+--error 1142,0;
 call foo4(); # definer's rights => failure
 show warnings;