diff options
Diffstat (limited to 'mysql-test')
| -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; |