diff options
| author | unknown <gbichot@quadita2.mysql.com> | 2005-05-05 18:37:38 +0200 |
|---|---|---|
| committer | unknown <gbichot@quadita2.mysql.com> | 2005-05-05 18:37:38 +0200 |
| commit | e6c2943c08f7a289e84b1885fb90ec6f8f3f000e (patch) | |
| tree | fe4bbe2a2cd4b590cbf68973944784f29aa553bf | |
| parent | 67385aaf8dee8e1ad68215d215ecb75bf0afefee (diff) | |
| parent | 97dd699ad1161b6bd3a946ac2c342d69bc7cdf84 (diff) | |
| download | mariadb-git-e6c2943c08f7a289e84b1885fb90ec6f8f3f000e.tar.gz | |
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
into quadita2.mysql.com:/nfstmp1/guilhem/mysql-5.0-4ita
| -rw-r--r-- | mysql-test/r/rpl_sp.result | 4 | ||||
| -rw-r--r-- | mysql-test/t/rpl_sp.test | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/mysql-test/r/rpl_sp.result b/mysql-test/r/rpl_sp.result index be93e51e34b..6e5fccfe4e2 100644 --- a/mysql-test/r/rpl_sp.result +++ b/mysql-test/r/rpl_sp.result @@ -106,7 +106,7 @@ insert into t2 values(3); 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 @@ call foo3(); 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 diff --git a/mysql-test/t/rpl_sp.test b/mysql-test/t/rpl_sp.test index c87585a138c..b8dc381630b 100644 --- a/mysql-test/t/rpl_sp.test +++ b/mysql-test/t/rpl_sp.test @@ -125,8 +125,9 @@ create procedure foo4() 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 @@ call foo3(); # success (definer == root) 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; |