From e35a4db1eb050546178cd561d78abf23ea97d8c2 Mon Sep 17 00:00:00 2001
From: Georgi Kodinov <joro@sun.com>
Date: Fri, 27 Nov 2009 18:07:31 +0200
Subject: [PATCH] Addendum to bug #48872: disable output in the test case
 because errors are dependent on the case mode

---
 mysql-test/r/sp-security.result | 5 -----
 mysql-test/t/sp-security.test   | 2 ++
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/mysql-test/r/sp-security.result b/mysql-test/r/sp-security.result
index 17758218e35..1451f8e88fd 100644
--- a/mysql-test/r/sp-security.result
+++ b/mysql-test/r/sp-security.result
@@ -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
diff --git a/mysql-test/t/sp-security.test b/mysql-test/t/sp-security.test
index 42c8ecd85ec..3d41d90404d 100644
--- a/mysql-test/t/sp-security.test
+++ b/mysql-test/t/sp-security.test
@@ -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`();