summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorGeorgi Kodinov <Georgi.Kodinov@Oracle.com>2011-03-31 16:08:31 +0300
committerGeorgi Kodinov <Georgi.Kodinov@Oracle.com>2011-03-31 16:08:31 +0300
commit6d849b93f202b1965df7cd47caa6e595816ef7ae (patch)
treea249ac208849adf74c8eeb6bb63fe067a345b72b /scripts
parent97d7805005efa9eb62482ed96e904a1ed4eeee6b (diff)
downloadmariadb-git-6d849b93f202b1965df7cd47caa6e595816ef7ae.tar.gz
Merged the fix for bug #11936829 to 5.5.11 release
Bug #11936829: DIFF. BETWEEN MYSQL.USER (AUTHENTICATION_STRING) IN FRESH AND UPGRADED 5.5.11 There was no modification for pre 5.5.11 builds that had authentication_string. Thus the column was not upgraded by mysql_upgrade. Fixed by adding an ALTER TABLE MODIFY to update an existing column to the latest type version. Test suite added.
Diffstat (limited to 'scripts')
-rw-r--r--scripts/mysql_system_tables_fix.sql1
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/mysql_system_tables_fix.sql b/scripts/mysql_system_tables_fix.sql
index c57b3be5fae..7e6ffb466a9 100644
--- a/scripts/mysql_system_tables_fix.sql
+++ b/scripts/mysql_system_tables_fix.sql
@@ -642,6 +642,7 @@ drop procedure mysql.die;
ALTER TABLE user ADD plugin char(64) DEFAULT '', ADD authentication_string TEXT;
ALTER TABLE user MODIFY plugin char(64) DEFAULT '';
+ALTER TABLE user MODIFY authentication_string TEXT;
-- Need to pre-fill mysql.proxies_priv with access for root even when upgrading from
-- older versions