bzr push into mysql-5.0-bugteam branch (joro:2855 to 2856) Bug#48872

[Georgi Kodinov]

 2856 Georgi Kodinov	2009-11-27
      Addendum to bug #48872: disable output in the test case because errors are 
      dependent on the case mode

    modified:
      mysql-test/r/sp-security.result
      mysql-test/t/sp-security.test
 2855 Georgi Kodinov	2009-11-27
      added the missing remove of the temp file

    modified:
      mysql-test/t/mysql.test
=== modified file 'mysql-test/r/sp-security.result'
--- a/mysql-test/r/sp-security.result	2009-11-27 09:59:44 +0000
+++ b/mysql-test/r/sp-security.result	2009-11-27 16:07:31 +0000
@@ -558,15 +558,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

=== modified file 'mysql-test/t/sp-security.test'
--- a/mysql-test/t/sp-security.test	2009-11-27 09:59:44 +0000
+++ b/mysql-test/t/sp-security.test	2009-11-27 16:07:31 +0000
@@ -921,6 +921,7 @@ SELECT F_TEST();
 
 CONNECTION con_tester_denied;
 
+--disable_result_log
 --error ER_TABLEACCESS_DENIED_ERROR
 SELECT * FROM TestTab;
 --error ER_PROCACCESS_DENIED_ERROR
@@ -931,6 +932,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`();
 


Attachment: [text/bzr-bundle] bzr/[e-mail]