diff options
author | Sergei Golubchik <sergii@pisem.net> | 2013-10-18 08:14:04 -0700 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2013-10-18 08:14:04 -0700 |
commit | cdb5510204f7d04242bb11e8d97509627af8afc0 (patch) | |
tree | 333cf134954e15896f5ad83b5c544a44397bf8ff /scripts | |
parent | 72d8b533cc102aad6be5046a0fe8b8e63ec1e218 (diff) | |
download | mariadb-git-cdb5510204f7d04242bb11e8d97509627af8afc0.tar.gz |
fix mysql_upgrade to preserve the collation of mysql.user.is_role
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/mysql_system_tables_fix.sql | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/mysql_system_tables_fix.sql b/scripts/mysql_system_tables_fix.sql index 5e09901a444..0c907e50f0d 100644 --- a/scripts/mysql_system_tables_fix.sql +++ b/scripts/mysql_system_tables_fix.sql @@ -188,7 +188,8 @@ ALTER TABLE user MODIFY Execute_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, MODIFY Repl_slave_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, MODIFY Repl_client_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, - MODIFY ssl_type enum('','ANY','X509', 'SPECIFIED') COLLATE utf8_general_ci DEFAULT '' NOT NULL; + MODIFY ssl_type enum('','ANY','X509', 'SPECIFIED') COLLATE utf8_general_ci DEFAULT '' NOT NULL, + MODIFY is_role enum('N', 'Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL; ALTER TABLE db MODIFY Host char(60) NOT NULL default '', |