diff options
| author | unknown <thek@adventure.(none)> | 2007-11-26 19:31:41 +0100 |
|---|---|---|
| committer | unknown <thek@adventure.(none)> | 2007-11-26 19:31:41 +0100 |
| commit | f1ad502ae1ebcac625a0213f9de1f178eb7a481e (patch) | |
| tree | de62ec4ce6fe4261be06adbc30cceadc56dae89b /mysql-test/t/grant.test | |
| parent | 1522ef3f21e2ec4d2b0ab0be62fb7aa78a839583 (diff) | |
| parent | 1ddb4722f4194691564396da05b09fe783d5b5de (diff) | |
| download | mariadb-git-f1ad502ae1ebcac625a0213f9de1f178eb7a481e.tar.gz | |
Merge adventure.(none):/home/thek/Development/cpp/bug16470/my51-bug16470
into adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
mysql-test/r/grant.result:
Auto merged
mysql-test/t/grant.test:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_parse.cc:
manual merge
Diffstat (limited to 'mysql-test/t/grant.test')
| -rw-r--r-- | mysql-test/t/grant.test | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/mysql-test/t/grant.test b/mysql-test/t/grant.test index 8d909d63f51..2a1940f4326 100644 --- a/mysql-test/t/grant.test +++ b/mysql-test/t/grant.test @@ -1277,3 +1277,23 @@ drop user юзер_юзер@localhost; --error ER_WRONG_STRING_LENGTH grant select on test.* to очень_длинный_юзер@localhost; set names default; + + +# +# Bug #16470 crash on grant if old grant tables +# +--echo FLUSH PRIVILEGES without procs_priv table. +RENAME TABLE mysql.procs_priv TO mysql.procs_gone; +FLUSH PRIVILEGES; +--echo Assigning privileges without procs_priv table. +CREATE DATABASE mysqltest1; +CREATE PROCEDURE mysqltest1.test() SQL SECURITY DEFINER + SELECT 1; +--error ER_NO_SUCH_TABLE +GRANT EXECUTE ON FUNCTION mysqltest1.test TO mysqltest_1@localhost; +GRANT ALL PRIVILEGES ON test.* TO mysqltest_1@localhost; +CALL mysqltest1.test(); +DROP DATABASE mysqltest1; +RENAME TABLE mysql.procs_gone TO mysql.procs_priv; +FLUSH PRIVILEGES; + |