diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2020-04-21 18:40:15 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2020-12-19 11:44:42 +0100 |
| commit | dfe8ef8bd83b359f00e9caa3d1df05434d329958 (patch) | |
| tree | a59b763779ce7d568b84823f2eb4a99383fcab34 | |
| parent | 6f40d5c8d6bf8742b2450410fc024caf3ac114b4 (diff) | |
| download | mariadb-git-dfe8ef8bd83b359f00e9caa3d1df05434d329958.tar.gz | |
MDEV-22630 mysql_upgrade (MariaDB 5.2.X --> MariaDB 10.3.X) does not fix auth_string to change it to authentication_string
cherry-pick from 10.4:
commit b976b9bfc3e
Author: Sergei Golubchik <serg@mariadb.com>
Date: Tue Apr 21 18:40:15 2020 +0200
MDEV-21244 mysql_upgrade creating empty global_priv table
support upgrades from 5.2 privilege tables
| -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 8e0894c41b3..9a8ebaa119e 100644 --- a/scripts/mysql_system_tables_fix.sql +++ b/scripts/mysql_system_tables_fix.sql @@ -646,6 +646,7 @@ UPDATE user SET Create_tablespace_priv = Super_priv WHERE @hadCreateTablespacePr ALTER TABLE user ADD plugin char(64) CHARACTER SET latin1 DEFAULT '' NOT NULL AFTER max_user_connections, ADD authentication_string TEXT NOT NULL AFTER plugin; +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 AFTER authentication_string; |