diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-11-06 08:41:48 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-11-06 08:41:48 +0200 |
| commit | 32062cc61cd00e4cd3b7939c8a09f9c3ac34ec76 (patch) | |
| tree | 098d64b7c988bab8cca25b0f716d92f6f7e72ed9 /scripts | |
| parent | af9649c722810eb1754953eb406a84ec876ce693 (diff) | |
| parent | bae21bfb5de17328c33c3da8d191c6d3af14ae02 (diff) | |
| download | mariadb-git-32062cc61cd00e4cd3b7939c8a09f9c3ac34ec76.tar.gz | |
Merge 10.1 into 10.2
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 db32834c4d6..c7fc0e006ec 100644 --- a/scripts/mysql_system_tables_fix.sql +++ b/scripts/mysql_system_tables_fix.sql @@ -462,14 +462,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 |