diff options
| author | unknown <jimw@mysql.com> | 2005-05-02 10:25:47 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-05-02 10:25:47 -0700 |
| commit | d4b39a511c92a86e2d8bb6236d62f160ca547897 (patch) | |
| tree | 71803adcb670f8b34123ef8306726aae14fa834a /mysql-test/r/system_mysql_db.result | |
| parent | 2d998575d3ad173a01c6eac6f9471ae770380c97 (diff) | |
| parent | 1968527da980bab642ee8341c6f96a8bf4a57c7a (diff) | |
| download | mariadb-git-d4b39a511c92a86e2d8bb6236d62f160ca547897.tar.gz | |
Resolve merge of fix for #8166.
mysql-test/r/system_mysql_db.result:
Update results
scripts/mysql_create_system_tables.sh:
Resolve merge of bug fix
scripts/mysql_fix_privilege_tables.sql:
Resolve merge of bug fix
Diffstat (limited to 'mysql-test/r/system_mysql_db.result')
| -rw-r--r-- | mysql-test/r/system_mysql_db.result | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/r/system_mysql_db.result b/mysql-test/r/system_mysql_db.result index 40a9c3b9af5..f3f019e43ba 100644 --- a/mysql-test/r/system_mysql_db.result +++ b/mysql-test/r/system_mysql_db.result @@ -63,6 +63,9 @@ host CREATE TABLE `host` ( `Lock_tables_priv` enum('N','Y') character set utf8 NOT NULL default 'N', `Create_view_priv` enum('N','Y') character set utf8 NOT NULL default 'N', `Show_view_priv` enum('N','Y') character set utf8 NOT NULL default 'N', + `Create_routine_priv` enum('N','Y') character set utf8 NOT NULL default 'N', + `Alter_routine_priv` enum('N','Y') character set utf8 NOT NULL default 'N', + `Execute_priv` enum('N','Y') character set utf8 NOT NULL default 'N', PRIMARY KEY (`Host`,`Db`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='Host privileges; Merged with database privileges' show create table user; |