summaryrefslogtreecommitdiff
path: root/scripts/mysql_create_system_tables.sh
diff options
context:
space:
mode:
authorjimw@mysql.com <>2005-02-17 18:07:14 -0800
committerjimw@mysql.com <>2005-02-17 18:07:14 -0800
commite9a5b7d50006b891d45064e8150e7646d18094ae (patch)
tree38472852edfc2045025f89d9e0c05d39cb887ffe /scripts/mysql_create_system_tables.sh
parent7eb8c130f7fc6a5aea90233c31ef219796a17390 (diff)
downloadmariadb-git-e9a5b7d50006b891d45064e8150e7646d18094ae.tar.gz
Clean up merge from 4.1, including making several enum fields
in the grant tables case-insensitive and updating test results.
Diffstat (limited to 'scripts/mysql_create_system_tables.sh')
-rw-r--r--scripts/mysql_create_system_tables.sh2
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"