diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2013-07-04 17:01:36 +0400 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2013-07-04 17:01:36 +0400 |
| commit | 34c7fe07502b89ab533ca5b8f32816790a716ef3 (patch) | |
| tree | 0294ff2f3e60bc818fdf4173cb67b8f2a606224b /scripts | |
| parent | f9a9309a77cbdab46b08c41191c9d9c0d47e75c3 (diff) | |
| download | mariadb-git-34c7fe07502b89ab533ca5b8f32816790a716ef3.tar.gz | |
Fix fix_priv_tables.test: make mysql_system_tables_fix.sql to not modify user.password_expired column.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mysql_system_tables_fix.sql | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/scripts/mysql_system_tables_fix.sql b/scripts/mysql_system_tables_fix.sql index 0033036de2a..24ded350d5f 100644 --- a/scripts/mysql_system_tables_fix.sql +++ b/scripts/mysql_system_tables_fix.sql @@ -631,6 +631,9 @@ UPDATE user SET Create_tablespace_priv = Super_priv WHERE @hadCreateTablespacePr ALTER TABLE user ADD plugin char(64) DEFAULT '', ADD authentication_string TEXT; ALTER TABLE user ADD password_expired ENUM('N', 'Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL; ALTER TABLE user MODIFY plugin char(64) CHARACTER SET latin1 DEFAULT '' NOT NULL, MODIFY authentication_string TEXT NOT NULL; +-- Somewhere above, we ran ALTER TABLE user .... CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin. +-- we want password_expired column to have collation utf8_general_ci. +ALTER TABLE user MODIFY password_expired ENUM('N', 'Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL; -- Need to pre-fill mysql.proxies_priv with access for root even when upgrading from -- older versions |