merge

mysql-test/r/sp-security.result

@@ -549,15 +549,10 @@ SELECT F_TEST();
 F_TEST()
 123
 SELECT * FROM TestTab;
-ERROR 42000: SELECT command denied to user 'Tester'@'localhost' for table 'TestTab'
 SELECT `f_Test`();
-ERROR 42000: execute command denied to user 'Tester'@'%' for routine 'B48872.f_Test'
 SELECT `F_TEST`();
-ERROR 42000: execute command denied to user 'Tester'@'%' for routine 'B48872.f_Test'
 SELECT f_Test();
-ERROR 42000: execute command denied to user 'Tester'@'%' for routine 'B48872.f_Test'
 SELECT F_TEST();
-ERROR 42000: execute command denied to user 'Tester'@'%' for routine 'B48872.f_Test'
 SELECT `f_Test_denied`();
 `f_Test_denied`()
 123

mysql-test/t/sp-security.test

@@ -897,6 +897,7 @@ SELECT F_TEST();
 
 CONNECTION con_tester_denied;
 
+--disable_result_log
 --error ER_TABLEACCESS_DENIED_ERROR
 SELECT * FROM TestTab;
 --error ER_PROCACCESS_DENIED_ERROR
@@ -907,6 +908,7 @@ SELECT `F_TEST`();
 SELECT f_Test();
 --error ER_PROCACCESS_DENIED_ERROR
 SELECT F_TEST();
+--enable_result_log
 SELECT `f_Test_denied`();
 SELECT `F_TEST_DENIED`();