diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-10-27 20:46:18 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-10-27 20:46:38 +0200 |
| commit | 37ab7e45963627f3c1ea2dd43d5b305de37bb16f (patch) | |
| tree | e07ada7fbde72c438f2a6a6c162e050caf1950f9 /scripts | |
| parent | 30c3d6db328d73f1b30be537aceb55d37936fdb9 (diff) | |
| parent | 893ebb739e24637985892da1555f2e6f1a8ac5b6 (diff) | |
| download | mariadb-git-37ab7e45963627f3c1ea2dd43d5b305de37bb16f.tar.gz | |
Merge branch '5.5' into 10.0
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mysql_system_tables_fix.sql | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/scripts/mysql_system_tables_fix.sql b/scripts/mysql_system_tables_fix.sql index 194b1615c2b..9d4318ad101 100644 --- a/scripts/mysql_system_tables_fix.sql +++ b/scripts/mysql_system_tables_fix.sql @@ -453,14 +453,11 @@ ALTER TABLE proc MODIFY name char(64) DEFAULT '' NOT NULL, DEFAULT CHARACTER SET utf8; # Correct the character set and collation -ALTER TABLE proc CONVERT TO CHARACTER SET utf8; # Reset some fields after the conversion -ALTER TABLE proc MODIFY db - char(64) collate utf8_bin DEFAULT '' NOT NULL, - MODIFY definer - char(141) collate utf8_bin DEFAULT '' NOT NULL, - MODIFY comment - text collate utf8_bin NOT NULL; +ALTER TABLE proc CONVERT TO CHARACTER SET utf8, + MODIFY db char(64) binary DEFAULT '' NOT NULL, + MODIFY definer char(141) binary DEFAULT '' NOT NULL, + MODIFY comment text binary NOT NULL; ALTER TABLE proc ADD character_set_client char(32) collate utf8_bin DEFAULT NULL |