diff options
| author | unknown <acurtis@xiphis.org> | 2005-05-17 19:54:20 +0100 |
|---|---|---|
| committer | unknown <acurtis@xiphis.org> | 2005-05-17 19:54:20 +0100 |
| commit | 55171821d238704a8b43a7ba4d150384f9ea70e1 (patch) | |
| tree | 09011cb747c8c1ed831bf8ca66668d0aa4f2610a /mysql-test/r/system_mysql_db.result | |
| parent | 9b07cafe1e7a1230218c06f85b88f68b5741c9ef (diff) | |
| download | mariadb-git-55171821d238704a8b43a7ba4d150384f9ea70e1.tar.gz | |
Bug#10246 - Parser: bad syntax for GRANT EXECUTE
Rename some functions
more fine-grained sp privileges
make grant/revoke sp grammar less ambigious
mysql-test/r/sp-security.result:
change test for new syntax
mysql-test/r/system_mysql_db.result:
change test for new syntax
mysql-test/t/sp-security.test:
change test for new syntax
scripts/mysql_create_system_tables.sh:
now store routine_type for procs_priv
scripts/mysql_fix_privilege_tables.sql:
now store routine_type for procs_priv
sql/item_func.cc:
rename of function
sql/mysql_priv.h:
rename of function
sql/sp_head.cc:
extra arg for check_some_routine_access
sql/sql_acl.cc:
rename of function. now handle func/proc acls seperately
sql/sql_acl.h:
rename of function
sql/sql_parse.cc:
rename of function
grants for procs handled distinctly from funcs
sql/sql_show.cc:
check_some_routine_access extra arg
sql/sql_base.cc:
fix for build
sql/sql_yacc.yy:
fix for build
Diffstat (limited to 'mysql-test/r/system_mysql_db.result')
| -rw-r--r-- | mysql-test/r/system_mysql_db.result | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mysql-test/r/system_mysql_db.result b/mysql-test/r/system_mysql_db.result index f3f019e43ba..159e9d15f29 100644 --- a/mysql-test/r/system_mysql_db.result +++ b/mysql-test/r/system_mysql_db.result @@ -152,10 +152,11 @@ procs_priv CREATE TABLE `procs_priv` ( `Db` char(64) collate utf8_bin NOT NULL default '', `User` char(16) collate utf8_bin NOT NULL default '', `Routine_name` char(64) collate utf8_bin NOT NULL default '', + `Routine_type` enum('FUNCTION','PROCEDURE') collate utf8_bin NOT NULL default 'FUNCTION', `Grantor` char(77) collate utf8_bin NOT NULL default '', - `Timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, `Proc_priv` set('Execute','Alter Routine','Grant') character set utf8 NOT NULL default '', - PRIMARY KEY (`Host`,`Db`,`User`,`Routine_name`), + `Timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, + PRIMARY KEY (`Host`,`Db`,`User`,`Routine_name`,`Routine_type`), KEY `Grantor` (`Grantor`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='Procedure privileges' show create table proc; |