Commit 481e743b authored by unknown's avatar unknown

making rpl_sp.test hostname-independent


mysql-test/t/rpl_sp.test:
  making test hostname-independent (don't know why the problem didn't appear on my machine)
mysql-test/r/rpl_sp.result:
  result update
parent 63604387
...@@ -106,7 +106,7 @@ insert into t2 values(3); ...@@ -106,7 +106,7 @@ insert into t2 values(3);
insert into t1 values (5); insert into t1 values (5);
end| end|
call foo4(); call foo4();
ERROR 42000: INSERT command denied to user 'zedjzlcsjhd'@'localhost' for table 't1' Got one of the listed errors
show warnings; show warnings;
Level Code Message 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 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(); ...@@ -114,7 +114,7 @@ call foo3();
show warnings; show warnings;
Level Code Message Level Code Message
call foo4(); call foo4();
ERROR 42000: INSERT command denied to user 'zedjzlcsjhd'@'localhost' for table 't1' Got one of the listed errors
show warnings; show warnings;
Level Code Message 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 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
......
...@@ -125,8 +125,9 @@ create procedure foo4() ...@@ -125,8 +125,9 @@ create procedure foo4()
delimiter ;| delimiter ;|
--replace_result localhost.localdomain localhost 127.0.0.1 localhost # I add ,0 so that it does not print the error in the test output,
--error 1142; # because this error is hostname-dependent
--error 1142,0;
call foo4(); # invoker has no INSERT grant on table => failure call foo4(); # invoker has no INSERT grant on table => failure
show warnings; show warnings;
...@@ -135,7 +136,7 @@ call foo3(); # success (definer == root) ...@@ -135,7 +136,7 @@ call foo3(); # success (definer == root)
show warnings; show warnings;
--replace_result localhost.localdomain localhost 127.0.0.1 localhost --replace_result localhost.localdomain localhost 127.0.0.1 localhost
--error 1142; --error 1142,0;
call foo4(); # definer's rights => failure call foo4(); # definer's rights => failure
show warnings; show warnings;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment