From 7f5180598fc6c5222a675274d0a10d6bde04d114 Mon Sep 17 00:00:00 2001
From: Jon Olav Hauglid <jon.hauglid@oracle.com>
Date: Wed, 13 Apr 2011 09:54:51 +0200
Subject: [PATCH] Bug#11882603 SELECT_ACL ON ANY COLUMN IN MYSQL.PROC ALLOWS TO
 SEE              DEFINITION OF ANY ROUTINE.

This follow-up patch removes SHOW PROCEDURE CODE from the test
case as this command is only available on debug versions of the
server and therefore caused the test to fail on release builds.
---
 mysql-test/r/sp-security.result | 7 +------
 mysql-test/t/sp-security.test   | 5 +----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/mysql-test/r/sp-security.result b/mysql-test/r/sp-security.result
index 04d11a35266..61ec3e80688 100644
--- a/mysql-test/r/sp-security.result
+++ b/mysql-test/r/sp-security.result
@@ -586,11 +586,9 @@ CREATE PROCEDURE db1.p1() SELECT 1;
 CREATE USER user2@localhost IDENTIFIED BY '';
 GRANT SELECT(db) ON mysql.proc TO user2@localhost;
 # Connection con2 as user2
-# The below statements before disclosed info from body_utf8 column.
+# The statement below before disclosed info from body_utf8 column.
 SHOW CREATE PROCEDURE db1.p1;
 ERROR 42000: PROCEDURE p1 does not exist
-SHOW PROCEDURE CODE db1.p1;
-ERROR 42000: PROCEDURE p1 does not exist
 # Check that SHOW works with SELECT grant on whole table
 # Connection default
 GRANT SELECT ON mysql.proc TO user2@localhost;
@@ -600,9 +598,6 @@ SHOW CREATE PROCEDURE db1.p1;
 Procedure	sql_mode	Create Procedure
 p1		CREATE DEFINER=`root`@`localhost` PROCEDURE `p1`()
 SELECT 1
-SHOW PROCEDURE CODE db1.p1;
-Pos	Instruction
-0	stmt 0 "SELECT 1"
 # Connection default
 DROP USER user2@localhost;
 DROP DATABASE db1;
diff --git a/mysql-test/t/sp-security.test b/mysql-test/t/sp-security.test
index dcbae756be9..3120cb76d14 100644
--- a/mysql-test/t/sp-security.test
+++ b/mysql-test/t/sp-security.test
@@ -966,11 +966,9 @@ GRANT SELECT(db) ON mysql.proc TO user2@localhost;
  
 --echo # Connection con2 as user2
 connect (con2, localhost, user2);
---echo # The below statements before disclosed info from body_utf8 column.
+--echo # The statement below before disclosed info from body_utf8 column.
 --error ER_SP_DOES_NOT_EXIST
 SHOW CREATE PROCEDURE db1.p1;
---error ER_SP_DOES_NOT_EXIST
-SHOW PROCEDURE CODE db1.p1;
 
 --echo # Check that SHOW works with SELECT grant on whole table
 --echo # Connection default
@@ -981,7 +979,6 @@ GRANT SELECT ON mysql.proc TO user2@localhost;
 connection con2;
 --echo # This should work
 SHOW CREATE PROCEDURE db1.p1;
-SHOW PROCEDURE CODE db1.p1;
 
 --echo # Connection default
 connection default;