1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge from mysql-5.1-security to mysql-5.5-security

Browse Source 
No conflicts
This commit is contained in:
Jon Olav Hauglid 2011-04-13 09:59:17 +02:00
commit 5d4a90a58d
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mysql-test/r/sp-security.result
View File

@ -602,11 +602,9 @@ CREATE PROCEDURE db1.p1() SELECT 1;
CREATE USER user2@localhost IDENTIFIED BY ''; CREATE USER user2@localhost IDENTIFIED BY '';
GRANT SELECT(db) ON mysql.proc TO user2@localhost; GRANT SELECT(db) ON mysql.proc TO user2@localhost;
# Connection con2 as user2 # 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; SHOW CREATE PROCEDURE db1.p1;
ERROR 42000: PROCEDURE p1 does not exist 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 # Check that SHOW works with SELECT grant on whole table
# Connection default # Connection default
GRANT SELECT ON mysql.proc TO user2@localhost; 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 Procedure sql_mode Create Procedure character_set_client collation_connection Database Collation
p1 CREATE DEFINER=`root`@`localhost` PROCEDURE `p1`() p1 CREATE DEFINER=`root`@`localhost` PROCEDURE `p1`()
SELECT 1 latin1 latin1_swedish_ci latin1_swedish_ci SELECT 1 latin1 latin1_swedish_ci latin1_swedish_ci
SHOW PROCEDURE CODE db1.p1;
Pos Instruction
0 stmt 0 "SELECT 1"
# Connection default # Connection default
DROP USER user2@localhost; DROP USER user2@localhost;
DROP DATABASE db1; DROP DATABASE db1;

5
mysql-test/t/sp-security.test
View File

@ -975,11 +975,9 @@ GRANT SELECT(db) ON mysql.proc TO user2@localhost;
--echo # Connection con2 as user2 --echo # Connection con2 as user2
connect (con2, localhost, 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 --error ER_SP_DOES_NOT_EXIST
SHOW CREATE PROCEDURE db1.p1; 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 # Check that SHOW works with SELECT grant on whole table
--echo # Connection default --echo # Connection default
@ -990,7 +988,6 @@ GRANT SELECT ON mysql.proc TO user2@localhost;
connection con2; connection con2;
--echo # This should work --echo # This should work
SHOW CREATE PROCEDURE db1.p1; SHOW CREATE PROCEDURE db1.p1;
SHOW PROCEDURE CODE db1.p1;
--echo # Connection default --echo # Connection default
connection default; connection default;