mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
Make sure all char columns in the mysql.* tables have the proper width in
mysql_fix_privilege_tables.sql, or they may get truncated during conversion to utf8. (Bug #7539)
This commit is contained in:
@ -9,13 +9,38 @@
|
|||||||
-- this sql script.
|
-- this sql script.
|
||||||
-- On windows you should do 'mysql --force mysql < mysql_fix_privilege_tables.sql'
|
-- On windows you should do 'mysql --force mysql < mysql_fix_privilege_tables.sql'
|
||||||
|
|
||||||
ALTER TABLE user type=MyISAM, CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin;
|
-- Convert all tables to UTF-8 with binary collation
|
||||||
ALTER TABLE db type=MyISAM, CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin;
|
-- and reset all char columns to correct width
|
||||||
ALTER TABLE host type=MyISAM, CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin;
|
ALTER TABLE user
|
||||||
ALTER TABLE func type=MyISAM, CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin;
|
MODIFY Host char(60) NOT NULL default '',
|
||||||
ALTER TABLE columns_priv type=MyISAM, CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin;
|
MODIFY User char(16) NOT NULL default '',
|
||||||
ALTER TABLE tables_priv type=MyISAM, CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin;
|
MODIFY Password char(41) NOT NULL default '',
|
||||||
ALTER TABLE user change Password Password char(41) binary not null;
|
ENGINE=MyISAM, CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin;
|
||||||
|
ALTER TABLE db
|
||||||
|
MODIFY Host char(60) NOT NULL default '',
|
||||||
|
MODIFY Db char(64) NOT NULL default '',
|
||||||
|
MODIFY User char(16) NOT NULL default '',
|
||||||
|
ENGINE=MyISAM, CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin;
|
||||||
|
ALTER TABLE host
|
||||||
|
MODIFY Host char(60) NOT NULL default '',
|
||||||
|
MODIFY Db char(64) NOT NULL default '',
|
||||||
|
ENGINE=MyISAM, CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin;
|
||||||
|
ALTER TABLE func
|
||||||
|
ENGINE=MyISAM, CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin;
|
||||||
|
ALTER TABLE columns_priv
|
||||||
|
MODIFY Host char(60) NOT NULL default '',
|
||||||
|
MODIFY Db char(64) NOT NULL default '',
|
||||||
|
MODIFY User char(16) NOT NULL default '',
|
||||||
|
MODIFY Table_name char(64) NOT NULL default '',
|
||||||
|
MODIFY Column_name char(64) NOT NULL default '',
|
||||||
|
ENGINE=MyISAM, CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin;
|
||||||
|
ALTER TABLE tables_priv
|
||||||
|
MODIFY Host char(60) NOT NULL default '',
|
||||||
|
MODIFY Db char(64) NOT NULL default '',
|
||||||
|
MODIFY User char(16) NOT NULL default '',
|
||||||
|
MODIFY Table_name char(64) NOT NULL default '',
|
||||||
|
MODIFY Grantor char(77) NOT NULL default '',
|
||||||
|
ENGINE=MyISAM, CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin;
|
||||||
ALTER TABLE user add File_priv enum('N','Y') NOT NULL;
|
ALTER TABLE user add File_priv enum('N','Y') NOT NULL;
|
||||||
CREATE TABLE IF NOT EXISTS func (
|
CREATE TABLE IF NOT EXISTS func (
|
||||||
name char(64) binary DEFAULT '' NOT NULL,
|
name char(64) binary DEFAULT '' NOT NULL,
|
||||||
|
Reference in New Issue
Block a user