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 /scripts/mysql_create_system_tables.sh | |
| 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 'scripts/mysql_create_system_tables.sh')
| -rw-r--r-- | scripts/mysql_create_system_tables.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/mysql_create_system_tables.sh b/scripts/mysql_create_system_tables.sh index b7dab0d931b..ea4c85d7a2c 100644 --- a/scripts/mysql_create_system_tables.sh +++ b/scripts/mysql_create_system_tables.sh @@ -253,7 +253,7 @@ then c_pp="$c_pp Routine_name char(64) binary DEFAULT '' NOT NULL," c_pp="$c_pp Grantor char(77) DEFAULT '' NOT NULL," c_pp="$c_pp Timestamp timestamp(14)," - c_pp="$c_pp Proc_priv set('Execute','Alter Routine','Grant') DEFAULT '' NOT NULL," + c_pp="$c_pp Proc_priv set('Execute','Alter Routine','Grant') COLLATE utf8_general_ci DEFAULT '' NOT NULL," c_pp="$c_pp PRIMARY KEY (Host,Db,User,Routine_name)," c_pp="$c_pp KEY Grantor (Grantor)" c_pp="$c_pp ) engine=MyISAM" |