diff options
| author | Georgi Kodinov <joro@sun.com> | 2009-11-27 18:10:28 +0200 |
|---|---|---|
| committer | Georgi Kodinov <joro@sun.com> | 2009-11-27 18:10:28 +0200 |
| commit | c256e3ab29be7cf1bc2a23c652466c4feb4ded98 (patch) | |
| tree | 64715c690abc3e15d0aa112fed8bafc0a78ace52 | |
| parent | 8cda87e433e3a8a60c77d0d1df4ae3fb09f7c729 (diff) | |
| parent | b7ed14638fd36d68d2fbabb861e5467d6751cbab (diff) | |
| download | mariadb-git-c256e3ab29be7cf1bc2a23c652466c4feb4ded98.tar.gz | |
merge
| -rw-r--r-- | mysql-test/r/sp-security.result | 5 | ||||
| -rw-r--r-- | 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 5f1d9b94277..c45ada2047a 100644 --- a/mysql-test/r/sp-security.result +++ b/mysql-test/r/sp-security.result @@ -549,15 +549,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 5e8c75a72e2..96f82c92248 100644 --- a/mysql-test/t/sp-security.test +++ b/mysql-test/t/sp-security.test @@ -897,6 +897,7 @@ SELECT F_TEST(); CONNECTION con_tester_denied; +--disable_result_log --error ER_TABLEACCESS_DENIED_ERROR SELECT * FROM TestTab; --error ER_PROCACCESS_DENIED_ERROR @@ -907,6 +908,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`(); |