diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-11-04 08:43:56 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-11-04 08:43:56 +0100 |
| commit | a30e87414c3d3bdb04d953e98853b5c07c370122 (patch) | |
| tree | 8e6a210bdde7b2cef8876ae4e07ed1882d4eb55c /scripts/mysql_system_tables_fix.sql | |
| parent | ba55e5e02b258c43cb87a00a221bacd0d83f29c0 (diff) | |
| parent | 00ba619106ca11aef27b8203fc03da2ec6c96409 (diff) | |
| download | mariadb-git-a30e87414c3d3bdb04d953e98853b5c07c370122.tar.gz | |
merge 10.0-base into 10.0
Diffstat (limited to 'scripts/mysql_system_tables_fix.sql')
| -rw-r--r-- | scripts/mysql_system_tables_fix.sql | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/scripts/mysql_system_tables_fix.sql b/scripts/mysql_system_tables_fix.sql index 0a7f08ca914..ad7122d9b9b 100644 --- a/scripts/mysql_system_tables_fix.sql +++ b/scripts/mysql_system_tables_fix.sql @@ -649,6 +649,20 @@ INSERT INTO tmp_proxies_priv VALUES ('localhost', 'root', '', '', TRUE, '', now( INSERT INTO proxies_priv SELECT * FROM tmp_proxies_priv WHERE @had_proxies_priv_table=0; DROP TABLE tmp_proxies_priv; +# MDEV-4332 longer user names +alter table mysql.user modify User char(80) binary not null default ''; +alter table mysql.db modify User char(80) binary not null default ''; +alter table mysql.tables_priv modify User char(80) binary not null default ''; +alter table mysql.columns_priv modify User char(80) binary not null default ''; +alter table mysql.procs_priv modify User char(80) binary not null default ''; +alter table mysql.proc modify definer char(141) collate utf8_bin not null default ''; +alter table mysql.event modify definer char(141) collate utf8_bin not null default ''; +alter table mysql.proxies_priv modify User char(80) COLLATE utf8_bin not null default ''; +alter table mysql.proxies_priv modify Proxied_user char(80) COLLATE utf8_bin not null default ''; +alter table mysql.proxies_priv modify Grantor char(141) COLLATE utf8_bin not null default ''; +alter table mysql.servers modify Username char(80) not null default ''; +alter table mysql.procs_priv modify Grantor char(141) COLLATE utf8_bin not null default ''; +alter table mysql.tables_priv modify Grantor char(141) COLLATE utf8_bin not null default ''; # Activate the new, possible modified privilege tables # This should not be needed, but gives us some extra testing that the above |