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

Merge branch '10.0' into 10.1

Browse Source
This commit is contained in:
Sergei Golubchik
2018-10-30 13:02:59 +01:00
parent 8772824ce7 f4b8b6b9a3
commit 44f6f44593
250 changed files with 16242 additions and 4270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
scripts/mysql_system_tables_fix.sql
View File

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