diff options
| author | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2011-04-13 09:59:17 +0200 |
|---|---|---|
| committer | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2011-04-13 09:59:17 +0200 |
| commit | e4041243970ab3b2f94c82f4004a28581c8ad4fd (patch) | |
| tree | 7a6931b87b1103397e20ffca3888daea83366e12 /mysql-test | |
| parent | 308694c6592b04a6b517997d3542ed081ba66ff2 (diff) | |
| parent | 1386f1fb626223bfda8db8c971a61e08e933e674 (diff) | |
| download | mariadb-git-e4041243970ab3b2f94c82f4004a28581c8ad4fd.tar.gz | |
Merge from mysql-5.1-security to mysql-5.5-security
No conflicts
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 7538bfc9f4a..88908b05f46 100644 --- a/mysql-test/r/sp-security.result +++ b/mysql-test/r/sp-security.result @@ -602,11 +602,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; @@ -616,9 +614,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 716529fa67b..ca4e6b04f13 100644 --- a/mysql-test/t/sp-security.test +++ b/mysql-test/t/sp-security.test @@ -975,11 +975,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 @@ -990,7 +988,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; |