diff options
| author | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2010-10-06 11:29:44 +0200 |
|---|---|---|
| committer | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2010-10-06 11:29:44 +0200 |
| commit | 38194bf7a5d4927f8adeddc5e00bf4feab08114f (patch) | |
| tree | b33dfb00e00ec3f4473c088305871021f437ee46 /scripts/mysql_system_tables_fix.sql | |
| parent | 623ed1946215e25682847ac3b0ea066cab35ea59 (diff) | |
| parent | 052c9e392e6d9b770511c88cfec05ef606bff2ed (diff) | |
| download | mariadb-git-38194bf7a5d4927f8adeddc5e00bf4feab08114f.tar.gz | |
Merge from mysql-5.5-bugteam to mysql-5.5-runtime.
Diffstat (limited to 'scripts/mysql_system_tables_fix.sql')
| -rw-r--r-- | scripts/mysql_system_tables_fix.sql | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/scripts/mysql_system_tables_fix.sql b/scripts/mysql_system_tables_fix.sql index 2020971fb1a..ceb910676ab 100644 --- a/scripts/mysql_system_tables_fix.sql +++ b/scripts/mysql_system_tables_fix.sql @@ -640,6 +640,11 @@ DROP PREPARE stmt; drop procedure mysql.die; +ALTER TABLE user ADD plugin char(60) DEFAULT '' NOT NULL, ADD authentication_string TEXT NOT NULL; +ALTER TABLE user MODIFY plugin char(60) DEFAULT '' NOT NULL; + +CREATE TABLE IF NOT EXISTS proxy_priv (Host char(60) binary DEFAULT '' NOT NULL, User char(16) binary DEFAULT '' NOT NULL, Proxied_User char(60) binary DEFAULT '' NOT NULL, Proxied_Host char(16) binary DEFAULT '' NOT NULL, With_Grant BOOL DEFAULT 0 NOT NULL, PRIMARY KEY Host (Host,User,Proxied_Host,Proxied_User) ) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin comment='Users and global privileges'; + # Activate the new, possible modified privilege tables # This should not be needed, but gives us some extra testing that the above # changes was correct |