diff options
| author | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2011-04-13 09:57:16 +0200 |
|---|---|---|
| committer | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2011-04-13 09:57:16 +0200 |
| commit | 1386f1fb626223bfda8db8c971a61e08e933e674 (patch) | |
| tree | 9bdb1d272eca58685fa960a90ef1625529a38a3d /mysql-test | |
| parent | 82d218d61f7d0811a91b0ff154a67b88239f013a (diff) | |
| parent | 005f91d219e4556e00f6fc8fd314da5b9e67626b (diff) | |
| download | mariadb-git-1386f1fb626223bfda8db8c971a61e08e933e674.tar.gz | |
Merge from mysql-5.0-security to mysql-5.1-security
Text conflict in mysql-test/r/sp-security.result
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/sp-security.result | 7 | ||||
| -rw-r--r-- | 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 9fd393a3528..39e39f2db5e 100644 --- a/mysql-test/r/sp-security.result +++ b/mysql-test/r/sp-security.result @@ -577,11 +577,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; @@ -591,9 +589,6 @@ SHOW CREATE PROCEDURE db1.p1; Procedure sql_mode Create Procedure character_set_client collation_connection Database Collation p1 CREATE DEFINER=`root`@`localhost` PROCEDURE `p1`() SELECT 1 latin1 latin1_swedish_ci latin1_swedish_ci -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 7de74e90ec7..b7a99ad4103 100644 --- a/mysql-test/t/sp-security.test +++ b/mysql-test/t/sp-security.test @@ -942,11 +942,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 @@ -957,7 +955,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; |