database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge 10.3 into 10.4

Browse Source
This commit is contained in:
Marko Mäkelä
2018-11-06 16:24:16 +02:00
parent 563efeceec df563e0c03
commit 074c684099
394 changed files with 24300 additions and 10755 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
scripts/mysql_system_tables_fix.sql
View File

@ -422,14 +422,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