diff options
| author | unknown <jimw@mysql.com> | 2005-02-17 18:07:14 -0800 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-02-17 18:07:14 -0800 |
| commit | e122a103e29e1525770edcc7a74d75549b9a3dd7 (patch) | |
| tree | 38472852edfc2045025f89d9e0c05d39cb887ffe /mysql-test/r/system_mysql_db.result | |
| parent | 90cc9c6bb60c60dbf6e603a0cb5d9ae736a9a906 (diff) | |
| download | mariadb-git-e122a103e29e1525770edcc7a74d75549b9a3dd7.tar.gz | |
Clean up merge from 4.1, including making several enum fields
in the grant tables case-insensitive and updating test results.
scripts/mysql_create_system_tables.sh:
Fix collation of procs_priv.proc_priv
scripts/mysql_fix_privilege_tables.sql:
Fix enum fields to have case-insensitive collation
mysql-test/r/information_schema.result:
Update results
mysql-test/r/system_mysql_db.result:
Update results
mysql-test/r/lowercase_table_grant.result:
Update results
Diffstat (limited to 'mysql-test/r/system_mysql_db.result')
| -rw-r--r-- | mysql-test/r/system_mysql_db.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/system_mysql_db.result b/mysql-test/r/system_mysql_db.result index 57fac02b732..930acf68706 100644 --- a/mysql-test/r/system_mysql_db.result +++ b/mysql-test/r/system_mysql_db.result @@ -150,7 +150,7 @@ procs_priv CREATE TABLE `procs_priv` ( `Routine_name` char(64) collate utf8_bin NOT NULL default '', `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') collate utf8_bin NOT NULL default '', + `Proc_priv` set('Execute','Alter Routine','Grant') character set utf8 NOT NULL default '', PRIMARY KEY (`Host`,`Db`,`User`,`Routine_name`), KEY `Grantor` (`Grantor`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='Procedure privileges' |