diff options
author | unknown <andrey@lmy004.> | 2006-01-10 19:16:58 +0100 |
---|---|---|
committer | unknown <andrey@lmy004.> | 2006-01-10 19:16:58 +0100 |
commit | 1ef97f1f3b3dc53a5945fb4fc7db6a3fea926379 (patch) | |
tree | f374f377fa98072d5ac942a68d46d2e59b46a466 /mysql-test/r/system_mysql_db.result | |
parent | f133a92312e6ca3040f58c05f4ea8d13f2f2ff5c (diff) | |
download | mariadb-git-1ef97f1f3b3dc53a5945fb4fc7db6a3fea926379.tar.gz |
WL #1034 (Internal CRON) pre-push updates
- fixed test results
- fixed bug caught by information_schema.test . Bison temporal
variables are very nice but extremely error-prone (Count one more
time just to be sure).
mysql-test/r/connect.result:
fix result for WL#1034 (internal CRON)
mysql-test/r/events.result:
fix result for WL#1034 (internal CRON)
mysql-test/r/grant.result:
fix result for WL#1034 (internal CRON)
mysql-test/r/information_schema.result:
fix result for WL#1034 (internal CRON)
mysql-test/r/lowercase_table_grant.result:
fix result for WL#1034 (internal CRON)
mysql-test/r/ps.result:
fix result for WL#1034 (internal CRON)
mysql-test/r/system_mysql_db.result:
fix result for WL#1034 (internal CRON)
mysql-test/t/events.test:
fix result for WL#1034 (internal CRON)
sql/sql_yacc.yy:
- fix bug introduced by me when making usage of temporal
bison variables. COUNT 7 times then write!
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 706165fef8a..32f0dc8b68c 100644 --- a/mysql-test/r/system_mysql_db.result +++ b/mysql-test/r/system_mysql_db.result @@ -3,6 +3,7 @@ show tables; Tables_in_db columns_priv db +event func help_category help_keyword @@ -42,6 +43,7 @@ db CREATE TABLE `db` ( `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', + `Event_priv` enum('N','Y') character set utf8 NOT NULL default 'N', PRIMARY KEY (`Host`,`Db`,`User`), KEY `User` (`User`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='Database privileges' @@ -101,6 +103,7 @@ user CREATE TABLE `user` ( `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', `Create_user_priv` enum('N','Y') character set utf8 NOT NULL default 'N', + `Event_priv` enum('N','Y') character set utf8 NOT NULL default 'N', `ssl_type` enum('','ANY','X509','SPECIFIED') character set utf8 NOT NULL default '', `ssl_cipher` blob NOT NULL, `x509_issuer` blob NOT NULL, |