diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-04-29 15:40:51 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-04-29 15:40:51 +0300 |
| commit | 496d0372ef2ff2a570c20923af4df32a03781acd (patch) | |
| tree | c15d45eeff0fbbfe6112816a72e10352551269ee /scripts | |
| parent | d4da131cff004e4157b755e417c49daef45ca80e (diff) | |
| parent | 5ba2aa1ddc074dc89db7f265ddb61ce96f714fc8 (diff) | |
| download | mariadb-git-496d0372ef2ff2a570c20923af4df32a03781acd.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mysql_system_tables_fix.sql | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/mysql_system_tables_fix.sql b/scripts/mysql_system_tables_fix.sql index 1518bbd5a2a..a9fc865401c 100644 --- a/scripts/mysql_system_tables_fix.sql +++ b/scripts/mysql_system_tables_fix.sql @@ -648,6 +648,7 @@ UPDATE user SET Delete_history_priv = Super_priv WHERE @had_user_delete_history_ ALTER TABLE user ADD plugin char(64) CHARACTER SET latin1 DEFAULT '' NOT NULL, ADD authentication_string TEXT NOT NULL; +ALTER TABLE user CHANGE auth_string authentication_string TEXT NOT NULL; ALTER TABLE user MODIFY plugin char(64) CHARACTER SET latin1 DEFAULT '' NOT NULL, MODIFY authentication_string TEXT NOT NULL; ALTER TABLE user ADD password_expired ENUM('N', 'Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL; |