diff options
Diffstat (limited to 'storage')
169 files changed, 613 insertions, 541 deletions
diff --git a/storage/connect/connect.cc b/storage/connect/connect.cc index 1a13dc71652..41bce530aeb 100644 --- a/storage/connect/connect.cc +++ b/storage/connect/connect.cc @@ -553,7 +553,8 @@ int CntCloseTable(PGLOBAL g, PTDB tdbp, bool nox, bool abort) if (!tdbp) return rc; // Nothing to do else if (tdbp->GetUse() != USE_OPEN) { - if (tdbp->GetAmType() == TYPE_AM_XML) + if (tdbp->GetAmType() == TYPE_AM_XML || + tdbp->GetAmType() == TYPE_AM_JSN) tdbp->CloseDB(g); // Opened by GetMaxSize return rc; diff --git a/storage/connect/mysql-test/connect/r/alter.result b/storage/connect/mysql-test/connect/r/alter.result index 7de43c88329..09f4584a75e 100644 --- a/storage/connect/mysql-test/connect/r/alter.result +++ b/storage/connect/mysql-test/connect/r/alter.result @@ -35,7 +35,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `c` char(5) NOT NULL, `d` char(10) NOT NULL -) ENGINE=CONNECT DEFAULT CHARSET=latin1 +) ENGINE=CONNECT DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT * FROM t1; c d 1 One @@ -61,7 +61,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `c` int(11) NOT NULL, `d` char(10) NOT NULL -) ENGINE=CONNECT DEFAULT CHARSET=latin1 `TABLE_TYPE`=CSV `HEADER`=1 `QUOTED`=1 +) ENGINE=CONNECT DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci `TABLE_TYPE`=CSV `HEADER`=1 `QUOTED`=1 # create an outward table used to see the t1 file CREATE TABLE t2 (line VARCHAR(100) NOT NULL) ENGINE=CONNECT FILE_NAME='t1.csv'; Warnings: @@ -90,7 +90,7 @@ t1 CREATE TABLE `t1` ( `d` char(10) NOT NULL, KEY `xc` (`c`), KEY `xd` (`d`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SHOW INDEX FROM t1; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment Ignored t1 1 xc 1 c A NULL NULL NULL BTREE NO @@ -108,7 +108,7 @@ t1 CREATE TABLE `t1` ( `d` char(10) NOT NULL, KEY `xc` (`c`), KEY `xd` (`d`) -) ENGINE=CONNECT DEFAULT CHARSET=latin1 `TABLE_TYPE`=DBF +) ENGINE=CONNECT DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci `TABLE_TYPE`=DBF SHOW INDEX FROM t1; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment Ignored t1 1 xc 1 c A NULL NULL NULL XINDEX NO @@ -167,7 +167,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `c` char(5) NOT NULL, `d` char(10) NOT NULL -) ENGINE=CONNECT DEFAULT CHARSET=latin1 `TABLE_TYPE`=fix `FILE_NAME`='tf1.txt' `ENDING`=1 +) ENGINE=CONNECT DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci `TABLE_TYPE`=fix `FILE_NAME`='tf1.txt' `ENDING`=1 SELECT * FROM t1; ERROR HY000: Got error 174 'File tf1.txt is not fixed length, len=66 lrecl=16' from CONNECT ALTER TABLE t1 MODIFY COLUMN c INT NOT NULL; @@ -189,7 +189,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `d` char(10) NOT NULL, `c` int(11) NOT NULL -) ENGINE=CONNECT DEFAULT CHARSET=latin1 `TABLE_TYPE`=fix `FILE_NAME`='tf1.txt' `ENDING`=1 +) ENGINE=CONNECT DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci `TABLE_TYPE`=fix `FILE_NAME`='tf1.txt' `ENDING`=1 # Wrong result SELECT * FROM t1; d c @@ -208,7 +208,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `d` char(10) NOT NULL `FLAG`=11, `c` int(11) NOT NULL `FLAG`=0 -) ENGINE=CONNECT DEFAULT CHARSET=latin1 `TABLE_TYPE`=fix `FILE_NAME`='tf1.txt' `ENDING`=1 +) ENGINE=CONNECT DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci `TABLE_TYPE`=fix `FILE_NAME`='tf1.txt' `ENDING`=1 SELECT * FROM t1; d c One 1 @@ -224,7 +224,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `d` char(10) NOT NULL /* `FLAG`=11 */, `c` int(11) NOT NULL /* `FLAG`=0 */ -) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 /* `TABLE_TYPE`=fix `FILE_NAME`='tf1.txt' `ENDING`=1 */ +) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 /* `TABLE_TYPE`=fix `FILE_NAME`='tf1.txt' `ENDING`=1 */ set @old_sql_mode=@@sql_mode; set sql_mode=ignore_bad_table_options; SHOW CREATE TABLE t1; @@ -232,7 +232,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `d` char(10) NOT NULL `FLAG`=11, `c` int(11) NOT NULL `FLAG`=0 -) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 `TABLE_TYPE`=fix `FILE_NAME`='tf1.txt' `ENDING`=1 +) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 `TABLE_TYPE`=fix `FILE_NAME`='tf1.txt' `ENDING`=1 set sql_mode=@old_sql_mode; SELECT * from t1; d c @@ -260,7 +260,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `d` char(10) NOT NULL `FLAG`=11, `c` int(11) NOT NULL `FLAG`=0 -) ENGINE=CONNECT DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 `TABLE_TYPE`=fix `FILE_NAME`='tf1.txt' `ENDING`=1 +) ENGINE=CONNECT DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 `TABLE_TYPE`=fix `FILE_NAME`='tf1.txt' `ENDING`=1 SELECT * from t1; d c One 1 diff --git a/storage/connect/mysql-test/connect/r/alter_xml.result b/storage/connect/mysql-test/connect/r/alter_xml.result index d2f882f1287..65ad40d8690 100644 --- a/storage/connect/mysql-test/connect/r/alter_xml.result +++ b/storage/connect/mysql-test/connect/r/alter_xml.result @@ -25,7 +25,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `c` int(11) NOT NULL, `d` char(10) NOT NULL -) ENGINE=CONNECT DEFAULT CHARSET=latin1 `HEADER`=1 `QUOTED`=1 `TABLE_TYPE`=XML `TABNAME`=t1 `OPTION_LIST`='xmlsup=domdoc,rownode=row' +) ENGINE=CONNECT DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci `HEADER`=1 `QUOTED`=1 `TABLE_TYPE`=XML `TABNAME`=t1 `OPTION_LIST`='xmlsup=domdoc,rownode=row' # Let us see the XML file CREATE TABLE t2 (line VARCHAR(100) NOT NULL) ENGINE=CONNECT FILE_NAME='t1.xml'; Warnings: @@ -65,7 +65,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `c` int(11) NOT NULL, `d` char(10) NOT NULL `XPATH`='@' -) ENGINE=CONNECT DEFAULT CHARSET=latin1 `QUOTED`=1 `TABLE_TYPE`=XML `TABNAME`=t1 `OPTION_LIST`='xmlsup=domdoc,rownode=row' `HEADER`=0 +) ENGINE=CONNECT DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci `QUOTED`=1 `TABLE_TYPE`=XML `TABNAME`=t1 `OPTION_LIST`='xmlsup=domdoc,rownode=row' `HEADER`=0 SELECT * FROM t2; line <?xml version="1.0" encoding="UTF-8"?> diff --git a/storage/connect/mysql-test/connect/r/alter_xml2.result b/storage/connect/mysql-test/connect/r/alter_xml2.result index e97e167e800..88359e4b4e1 100644 --- a/storage/connect/mysql-test/connect/r/alter_xml2.result +++ b/storage/connect/mysql-test/connect/r/alter_xml2.result @@ -25,7 +25,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `c` int(11) NOT NULL, `d` char(10) NOT NULL -) ENGINE=CONNECT DEFAULT CHARSET=latin1 `HEADER`=1 `QUOTED`=1 `TABLE_TYPE`=XML `TABNAME`=t1 `OPTION_LIST`='xmlsup=libxml2,rownode=row' +) ENGINE=CONNECT DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci `HEADER`=1 `QUOTED`=1 `TABLE_TYPE`=XML `TABNAME`=t1 `OPTION_LIST`='xmlsup=libxml2,rownode=row' # Let us see the XML file CREATE TABLE t2 (line VARCHAR(100) NOT NULL) ENGINE=CONNECT FILE_NAME='t1.xml'; Warnings: @@ -65,7 +65,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `c` int(11) NOT NULL, `d` char(10) NOT NULL `XPATH`='@' -) ENGINE=CONNECT DEFAULT CHARSET=latin1 `QUOTED`=1 `TABLE_TYPE`=XML `TABNAME`=t1 `OPTION_LIST`='xmlsup=libxml2,rownode=row' `HEADER`=0 +) ENGINE=CONNECT DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci `QUOTED`=1 `TABLE_TYPE`=XML `TABNAME`=t1 `OPTION_LIST`='xmlsup=libxml2,rownode=row' `HEADER`=0 SELECT * FROM t2; line <?xml version="1.0" encoding="UTF-8"?> diff --git a/storage/connect/mysql-test/connect/r/bin.result b/storage/connect/mysql-test/connect/r/bin.result index 1baa18a1e4d..14808745c76 100644 --- a/storage/connect/mysql-test/connect/r/bin.result +++ b/storage/connect/mysql-test/connect/r/bin.result @@ -59,7 +59,7 @@ t1 CREATE TABLE `t1` ( `id` char(5) NOT NULL `FIELD_FORMAT`='S', `salary` double(9,2) NOT NULL DEFAULT 0.00 `FIELD_FORMAT`='F', `dept` int(4) NOT NULL `FIELD_FORMAT`='S' -) ENGINE=CONNECT DEFAULT CHARSET=latin1 `TABLE_TYPE`=BIN `FILE_NAME`='Testbal.dat' `OPTION_LIST`='Endian=Little' `READONLY`=NO +) ENGINE=CONNECT DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci `TABLE_TYPE`=BIN `FILE_NAME`='Testbal.dat' `OPTION_LIST`='Endian=Little' `READONLY`=NO INSERT INTO t1 VALUES (7777,'BILL','1973-06-30',4444,5555.555,777); SELECT * FROM t1; fig name birth id salary dept @@ -78,7 +78,7 @@ t1 CREATE TABLE `t1` ( `id` char(5) NOT NULL `FIELD_FORMAT`='S', `salary` double(9,2) NOT NULL DEFAULT 0.00 `FIELD_FORMAT`='F', `dept` int(4) NOT NULL `FIELD_FORMAT`='S' -) ENGINE=CONNECT DEFAULT CHARSET=latin1 `TABLE_TYPE`=BIN `FILE_NAME`='Testbal.dat' `OPTION_LIST`='Endian=Little' `READONLY`=YES +) ENGINE=CONNECT DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci `TABLE_TYPE`=BIN `FILE_NAME`='Testbal.dat' `OPTION_LIST`='Endian=Little' `READONLY`=YES INSERT INTO t1 VALUES (7777,'BILL','1973-06-30',4444,5555.555,777); ERROR HY000: Table 't1' is read only DROP TABLE t1; diff --git a/storage/connect/mysql-test/connect/r/bson.result b/storage/connect/mysql-test/connect/r/bson.result index 8b9a92e4489..a9567fe47b3 100644 --- a/storage/connect/mysql-test/connect/r/bson.result +++ b/storage/connect/mysql-test/connect/r/bson.result @@ -515,3 +515,27 @@ Beth 4 Food 17.00 Beth 4 Beer 15.00 Janet 4 Car 17.00 DROP TABLE t1, t2, t3, t4; +# +# MDEV-29426 memory leak on "SHOW INDEX" +# +CREATE TABLE t1 +( +ISBN CHAR(15) NOT NULL, +Language CHAR(2) JPATH='$.LANG', +Subject CHAR(32) JPATH='$.SUBJECT', +AuthorFN CHAR(128) JPATH='$.AUTHOR[*].FIRSTNAME', +AuthorLN CHAR(128) JPATH='$.AUTHOR[*].LASTNAME', +Title CHAR(32) JPATH='$.TITLE', +Translation CHAR(32) JPATH='$.TRANSLATED.PREFIX', +TranslatorFN CHAR(80) JPATH='$.TRANSLATED.TRANSLATOR.FIRSTNAME', +TranslatorLN CHAR(80) JPATH='$.TRANSLATED.TRANSLATOR.LASTNAME', +Publisher CHAR(20) JPATH='$.PUBLISHER.NAME', +Location CHAR(16) JPATH='$.PUBLISHER.PLACE', +Year int(4) JPATH='$.DATEPUB', +INDEX IX(ISBN) +) +ENGINE=CONNECT TABLE_TYPE=BSON FILE_NAME='bib0.json' LRECL=320 OPTION_LIST='Pretty=0'; +SHOW INDEX FROM t1; +Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment Ignored +t1 1 IX 1 ISBN A NULL NULL NULL XINDEX NO +DROP TABLE t1; diff --git a/storage/connect/mysql-test/connect/r/csv.result b/storage/connect/mysql-test/connect/r/csv.result index be25a842bc4..4fc8269875d 100644 --- a/storage/connect/mysql-test/connect/r/csv.result +++ b/storage/connect/mysql-test/connect/r/csv.result @@ -69,7 +69,7 @@ t1 CREATE TABLE `t1` ( `name` char(12) NOT NULL, `birth` date NOT NULL `DATE_FORMAT`='DD/MM/YY', `children` smallint(2) NOT NULL -) ENGINE=CONNECT DEFAULT CHARSET=latin1 `TABLE_TYPE`=CSV `FILE_NAME`='people.csv' `HEADER`=1 `SEP_CHAR`=';' `QUOTED`=1 `READONLY`=no +) ENGINE=CONNECT DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci `TABLE_TYPE`=CSV `FILE_NAME`='people.csv' `HEADER`=1 `SEP_CHAR`=';' `QUOTED`=1 `READONLY`=no INSERT INTO t1 VALUES ('BILL','1973-06-30',5); SELECT * FROM t1; name birth children @@ -84,7 +84,7 @@ t1 CREATE TABLE `t1` ( `name` char(12) NOT NULL, `birth` date NOT NULL `DATE_FORMAT`='DD/MM/YY', `children` smallint(2) NOT NULL -) ENGINE=CONNECT DEFAULT CHARSET=latin1 `TABLE_TYPE`=CSV `FILE_NAME`='people.csv' `HEADER`=1 `SEP_CHAR`=';' `QUOTED`=1 `READONLY`=1 +) ENGINE=CONNECT DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci `TABLE_TYPE`=CSV `FILE_NAME`='people.csv' `HEADER`=1 `SEP_CHAR`=';' `QUOTED`=1 `READONLY`=1 INSERT INTO t1 VALUES ('BILL','1973-06-30',5); ERROR HY000: Table 't1' is read only SELECT * FROM t1; diff --git a/storage/connect/mysql-test/connect/r/dbf.result b/storage/connect/mysql-test/connect/r/dbf.result index 7296d73a258..65d894a0c24 100644 --- a/storage/connect/mysql-test/connect/r/dbf.result +++ b/storage/connect/mysql-test/connect/r/dbf.result @@ -6,7 +6,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) NOT NULL -) ENGINE=CONNECT DEFAULT CHARSET=latin1 `TABLE_TYPE`=DBF `FILE_NAME`='t1.dbf' +) ENGINE=CONNECT DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci `TABLE_TYPE`=DBF `FILE_NAME`='t1.dbf' SELECT * FROM t1; a Warnings: @@ -62,7 +62,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) NOT NULL -) ENGINE=CONNECT DEFAULT CHARSET=latin1 `TABLE_TYPE`=DBF `FILE_NAME`='t1.dbf' +) ENGINE=CONNECT DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci `TABLE_TYPE`=DBF `FILE_NAME`='t1.dbf' INSERT INTO t1 VALUES (10),(20); SELECT * FROM t1; a @@ -73,7 +73,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) NOT NULL -) ENGINE=CONNECT DEFAULT CHARSET=latin1 `TABLE_TYPE`=DBF `FILE_NAME`='t1.dbf' `READONLY`=Yes +) ENGINE=CONNECT DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci `TABLE_TYPE`=DBF `FILE_NAME`='t1.dbf' `READONLY`=Yes INSERT INTO t1 VALUES (30); ERROR HY000: Table 't1' is read only UPDATE t1 SET a=30 WHERE a=10; @@ -87,7 +87,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) NOT NULL -) ENGINE=CONNECT DEFAULT CHARSET=latin1 `TABLE_TYPE`=DBF `FILE_NAME`='t1.dbf' `READONLY`=NO +) ENGINE=CONNECT DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci `TABLE_TYPE`=DBF `FILE_NAME`='t1.dbf' `READONLY`=NO INSERT INTO t1 VALUES (30); SELECT * FROM t1; a @@ -119,7 +119,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) NOT NULL -) ENGINE=CONNECT DEFAULT CHARSET=latin1 `table_type`=dbf `file_name`='t1.dbf' +) ENGINE=CONNECT DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci `table_type`=dbf `file_name`='t1.dbf' INSERT INTO t1 VALUES (10); SELECT * FROM t1; a @@ -130,7 +130,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `a` char(10) NOT NULL -) ENGINE=CONNECT DEFAULT CHARSET=latin1 `Table_Type`=dbf `File_Name`='t1.dbf' +) ENGINE=CONNECT DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci `Table_Type`=dbf `File_Name`='t1.dbf' INSERT INTO t1 VALUES ('test'); SELECT * FROM t1; a @@ -243,7 +243,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a01234567a` int(11) NOT NULL, `b01234567b` int(11) NOT NULL -) ENGINE=CONNECT DEFAULT CHARSET=latin1 `TABLE_TYPE`=DBF `FILE_NAME`='t02x13.dbf' +) ENGINE=CONNECT DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci `TABLE_TYPE`=DBF `FILE_NAME`='t02x13.dbf' INSERT INTO t1 VALUES (1,2); SELECT * FROM t1; a01234567a b01234567b @@ -532,7 +532,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `a` varchar(10) NOT NULL -) ENGINE=CONNECT DEFAULT CHARSET=latin1 `TABLE_TYPE`=DBF `FILE_NAME`='t1c.dbf' +) ENGINE=CONNECT DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci `TABLE_TYPE`=DBF `FILE_NAME`='t1c.dbf' SELECT * FROM t1; a 10 @@ -561,7 +561,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `a` int(10) NOT NULL -) ENGINE=CONNECT DEFAULT CHARSET=latin1 `TABLE_TYPE`=DBF `FILE_NAME`='t1c.dbf' +) ENGINE=CONNECT DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci `TABLE_TYPE`=DBF `FILE_NAME`='t1c.dbf' SELECT * FROM t1; a 10 diff --git a/storage/connect/mysql-test/connect/r/dir.result b/storage/connect/mysql-test/connect/r/dir.result index 139544b99e9..d13d2a455c0 100644 --- a/storage/connect/mysql-test/connect/r/dir.result +++ b/storage/connect/mysql-test/connect/r/dir.result @@ -20,7 +20,7 @@ t1 CREATE TABLE `t1` ( `fname` varchar(256) NOT NULL, `ftype` char(4) NOT NULL, `size` double(12,0) NOT NULL `flag`=5 -) ENGINE=CONNECT DEFAULT CHARSET=latin1 `TABLE_TYPE`=DIR `FILE_NAME`='*.txt' `OPTION_LIST`='subdir=0' +) ENGINE=CONNECT DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci `TABLE_TYPE`=DIR `FILE_NAME`='*.txt' `OPTION_LIST`='subdir=0' SELECT fname, ftype, size FROM t1 ORDER BY fname, ftype, size; fname ftype size boys .txt 282 diff --git a/storage/connect/mysql-test/connect/r/fix.result b/storage/connect/mysql-test/connect/r/fix.result index 4d620c66a04..4b8806c1cc9 100644 --- a/storage/connect/mysql-test/connect/r/fix.result +++ b/storage/connect/mysql-test/connect/r/fix.result @@ -26,7 +26,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `id` int(11) NOT NULL -) ENGINE=CONNECT DEFAULT CHARSET=latin1 `TABLE_TYPE`=FIX `FILE_NAME`='t1.txt' `READONLY`=1 +) ENGINE=CONNECT DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci `TABLE_TYPE`=FIX `FILE_NAME`='t1.txt' `READONLY`=1 INSERT INTO t1 VALUES (20); ERROR HY000: Table 't1' is read only UPDATE t1 SET id=20 WHERE id=10; @@ -40,7 +40,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `id` int(11) NOT NULL -) ENGINE=CONNECT DEFAULT CHARSET=latin1 `TABLE_TYPE`=FIX `FILE_NAME`='t1.txt' `READONLY`=0 +) ENGINE=CONNECT DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci `TABLE_TYPE`=FIX `FILE_NAME`='t1.txt' `READONLY`=0 INSERT INTO t1 VALUES (20); SELECT * FROM t1; id diff --git a/storage/connect/mysql-test/connect/r/grant2.result b/storage/connect/mysql-test/connect/r/grant2.result index 2e20dc39596..4999b76fe50 100644 --- a/storage/connect/mysql-test/connect/r/grant2.result +++ b/storage/connect/mysql-test/connect/r/grant2.result @@ -620,7 +620,7 @@ SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( `a` int(11) DEFAULT NULL -) ENGINE=CONNECT DEFAULT CHARSET=latin1 `TABLE_TYPE`=fix `FILE_NAME`='t1.fix' +) ENGINE=CONNECT DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci `TABLE_TYPE`=fix `FILE_NAME`='t1.fix' RENAME TABLE t2 TO t1; connection user; RENAME TABLE t1 TO t2; @@ -636,7 +636,7 @@ SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( `a` int(11) DEFAULT NULL -) ENGINE=CONNECT DEFAULT CHARSET=latin1 `TABLE_TYPE`=fix `FILE_NAME`='t1.fix' +) ENGINE=CONNECT DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci `TABLE_TYPE`=fix `FILE_NAME`='t1.fix' ALTER TABLE t2 RENAME TO t1; connection user; ALTER TABLE t1 RENAME TO t2; diff --git a/storage/connect/mysql-test/connect/r/ini.result b/storage/connect/mysql-test/connect/r/ini.result index a377cb3ee20..86d25c8d649 100644 --- a/storage/connect/mysql-test/connect/r/ini.result +++ b/storage/connect/mysql-test/connect/r/ini.result @@ -190,7 +190,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `contact` char(10) DEFAULT NULL `flag`=1, `c2` char(60) DEFAULT NULL -) ENGINE=CONNECT DEFAULT CHARSET=latin1 `TABLE_TYPE`=INI `FILE_NAME`='t1.ini' `READONLY`=1 +) ENGINE=CONNECT DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci `TABLE_TYPE`=INI `FILE_NAME`='t1.ini' `READONLY`=1 INSERT INTO t1 VALUES ('US',40); ERROR HY000: Table 't1' is read only UPDATE t1 SET c2=20 WHERE c2=10; @@ -205,7 +205,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `contact` char(10) DEFAULT NULL `flag`=1, `c2` char(60) DEFAULT NULL -) ENGINE=CONNECT DEFAULT CHARSET=latin1 `TABLE_TYPE`=INI `FILE_NAME`='t1.ini' `READONLY`=0 +) ENGINE=CONNECT DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci `TABLE_TYPE`=INI `FILE_NAME`='t1.ini' `READONLY`=0 INSERT INTO t1 VALUES ('US',40); SELECT * FROM t1; contact c2 diff --git a/storage/connect/mysql-test/connect/r/json.result b/storage/connect/mysql-test/connect/r/json.result index 8cc4e66c2ea..55b1bb8b8e5 100644 --- a/storage/connect/mysql-test/connect/r/json.result +++ b/storage/connect/mysql-test/connect/r/json.result @@ -515,3 +515,27 @@ Beth 4 Food 17.00 Beth 4 Beer 15.00 Janet 4 Car 17.00 DROP TABLE t1, t2, t3, t4; +# +# MDEV-29426 memory leak on "SHOW INDEX" +# +CREATE TABLE t1 +( +ISBN CHAR(15) NOT NULL, +Language CHAR(2) JPATH='$.LANG', +Subject CHAR(32) JPATH='$.SUBJECT', +AuthorFN CHAR(128) JPATH='$.AUTHOR[*].FIRSTNAME', +AuthorLN CHAR(128) JPATH='$.AUTHOR[*].LASTNAME', +Title CHAR(32) JPATH='$.TITLE', +Translation CHAR(32) JPATH='$.TRANSLATED.PREFIX', +TranslatorFN CHAR(80) JPATH='$.TRANSLATED.TRANSLATOR.FIRSTNAME', +TranslatorLN CHAR(80) JPATH='$.TRANSLATED.TRANSLATOR.LASTNAME', +Publisher CHAR(20) JPATH='$.PUBLISHER.NAME', +Location CHAR(16) JPATH='$.PUBLISHER.PLACE', +Year int(4) JPATH='$.DATEPUB', +INDEX IX(ISBN) +) +ENGINE=CONNECT TABLE_TYPE=JSON FILE_NAME='bib0.json' LRECL=320 OPTION_LIST='Pretty=0'; +SHOW INDEX FROM t1; +Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment Ignored +t1 1 IX 1 ISBN A NULL NULL NULL XINDEX NO +DROP TABLE t1; diff --git a/storage/connect/mysql-test/connect/r/mysql.result b/storage/connect/mysql-test/connect/r/mysql.result index 4377d2ad014..83c2bc0abb5 100644 --- a/storage/connect/mysql-test/connect/r/mysql.result +++ b/storage/connect/mysql-test/connect/r/mysql.result @@ -26,7 +26,7 @@ Table Create Table t2 CREATE TABLE `t2` ( `x` int(11) DEFAULT NULL, `y` char(10) DEFAULT NULL -) ENGINE=CONNECT DEFAULT CHARSET=latin1 `TABLE_TYPE`=MYSQL `TABNAME`='t1' `OPTION_LIST`='host=localhost,user=root,port=PORT' +) ENGINE=CONNECT DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci `TABLE_TYPE`=MYSQL `TABNAME`='t1' `OPTION_LIST`='host=localhost,user=root,port=PORT' SELECT * FROM t2; ERROR HY000: Got error 174 '(1054) Unknown column 'x' in 'field list' [SELECT `x`, `y` FROM `t1`]' from CONNECT DROP TABLE t2; @@ -45,7 +45,7 @@ Table Create Table t2 CREATE TABLE `t2` ( `a` int(11) DEFAULT NULL, `b` char(10) DEFAULT NULL -) ENGINE=CONNECT DEFAULT CHARSET=latin1 `TABLE_TYPE`='MYSQL' `TABNAME`='t1' `OPTION_LIST`='host=localhost,user=root,port=PORT' +) ENGINE=CONNECT DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci `TABLE_TYPE`='MYSQL' `TABNAME`='t1' `OPTION_LIST`='host=localhost,user=root,port=PORT' SELECT * FROM t2; a b NULL NULL @@ -60,7 +60,7 @@ Table Create Table t2 CREATE TABLE `t2` ( `a` int(11) DEFAULT NULL, `b` char(10) DEFAULT NULL -) ENGINE=CONNECT DEFAULT CHARSET=latin1 `TABLE_TYPE`=MYSQL `TABNAME`='t1' `OPTION_LIST`='host=localhost,user=root,port=PORT' +) ENGINE=CONNECT DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci `TABLE_TYPE`=MYSQL `TABNAME`='t1' `OPTION_LIST`='host=localhost,user=root,port=PORT' SELECT * FROM t2; a b NULL NULL @@ -75,7 +75,7 @@ Table Create Table t2 CREATE TABLE `t2` ( `a` int(11) NOT NULL, `b` char(10) NOT NULL -) ENGINE=CONNECT DEFAULT CHARSET=latin1 `TABLE_TYPE`=MYSQL `TABNAME`='t1' `OPTION_LIST`='host=localhost,user=root,port=PORT' +) ENGINE=CONNECT DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci `TABLE_TYPE`=MYSQL `TABNAME`='t1' `OPTION_LIST`='host=localhost,user=root,port=PORT' SELECT * FROM t2; a b 0 @@ -90,7 +90,7 @@ Table Create Table t2 CREATE TABLE `t2` ( `a` char(10) DEFAULT NULL, `b` int(11) DEFAULT NULL -) ENGINE=CONNECT DEFAULT CHARSET=latin1 `TABLE_TYPE`=MYSQL `TABNAME`='t1' `OPTION_LIST`='host=localhost,user=root,port=PORT' +) ENGINE=CONNECT DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci `TABLE_TYPE`=MYSQL `TABNAME`='t1' `OPTION_LIST`='host=localhost,user=root,port=PORT' SELECT * FROM t2; a b NULL NULL @@ -109,12 +109,12 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `a` smallint(6) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( `a` smallint(6) DEFAULT NULL -) ENGINE=CONNECT DEFAULT CHARSET=latin1 `TABLE_TYPE`='MYSQL' `TABNAME`='t1' `OPTION_LIST`='host=localhost,user=root,port=PORT' +) ENGINE=CONNECT DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci `TABLE_TYPE`='MYSQL' `TABNAME`='t1' `OPTION_LIST`='host=localhost,user=root,port=PORT' SELECT * FROM t2; a DROP TABLE t2, t1; @@ -124,12 +124,12 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `a` mediumint(9) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( `a` int(9) DEFAULT NULL -) ENGINE=CONNECT DEFAULT CHARSET=latin1 `TABLE_TYPE`='MYSQL' `TABNAME`='t1' `OPTION_LIST`='host=localhost,user=root,port=PORT' +) ENGINE=CONNECT DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci `TABLE_TYPE`='MYSQL' `TABNAME`='t1' `OPTION_LIST`='host=localhost,user=root,port=PORT' SELECT * FROM t2; a DROP TABLE t2, t1; @@ -139,12 +139,12 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( `a` int(11) DEFAULT NULL -) ENGINE=CONNECT DEFAULT CHARSET=latin1 `TABLE_TYPE`='MYSQL' `TABNAME`='t1' `OPTION_LIST`='host=localhost,user=root,port=PORT' +) ENGINE=CONNECT DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci `TABLE_TYPE`='MYSQL' `TABNAME`='t1' `OPTION_LIST`='host=localhost,user=root,port=PORT' SELECT * FROM t2; a DROP TABLE t2, t1; @@ -154,12 +154,12 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `a` bigint(20) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( `a` bigint(20) DEFAULT NULL -) ENGINE=CONNECT DEFAULT CHARSET=latin1 `TABLE_TYPE`='MYSQL' `TABNAME`='t1' `OPTION_LIST`='host=localhost,user=root,port=PORT' +) ENGINE=CONNECT DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci `TABLE_TYPE`='MYSQL' `TABNAME`='t1' `OPTION_LIST`='host=localhost,user=root,port=PORT' SELECT * FROM t2; a DROP TABLE t2, t1; @@ -172,12 +172,12 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `a` char(10) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( `a` char(10) DEFAULT NULL -) ENGINE=CONNECT DEFAULT CHARSET=latin1 `TABLE_TYPE`='MYSQL' `TABNAME`='t1' `OPTION_LIST`='host=localhost,user=root,port=PORT' +) ENGINE=CONNECT DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci `TABLE_TYPE`='MYSQL' `TABNAME`='t1' `OPTION_LIST`='host=localhost,user=root,port=PORT' SELECT * FROM t2; a DROP TABLE t2, t1; @@ -187,12 +187,12 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `a` varchar(10) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( `a` varchar(10) DEFAULT NULL -) ENGINE=CONNECT DEFAULT CHARSET=latin1 `TABLE_TYPE`='MYSQL' `TABNAME`='t1' `OPTION_LIST`='host=localhost,user=root,port=PORT' +) ENGINE=CONNECT DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci `TABLE_TYPE`='MYSQL' `TABNAME`='t1' `OPTION_LIST`='host=localhost,user=root,port=PORT' SELECT * FROM t2; a DROP TABLE t2, t1; @@ -208,12 +208,12 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `a` date DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( `a` date DEFAULT NULL -) ENGINE=CONNECT DEFAULT CHARSET=latin1 `TABLE_TYPE`='MYSQL' `TABNAME`='t1' `OPTION_LIST`='host=localhost,user=root,port=PORT' +) ENGINE=CONNECT DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci `TABLE_TYPE`='MYSQL' `TABNAME`='t1' `OPTION_LIST`='host=localhost,user=root,port=PORT' SELECT * FROM t2; a DROP TABLE t2, t1; @@ -233,7 +233,7 @@ a /*!40101 SET character_set_client = utf8 */; CREATE TABLE `t2` ( `a` int(11) DEFAULT NULL -) ENGINE=CONNECT DEFAULT CHARSET=latin1 CONNECTION='mysql://root@localhost:PORT/test/t1' `TABLE_TYPE`='MYSQL'; +) ENGINE=CONNECT DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci CONNECTION='mysql://root@localhost:PORT/test/t1' `TABLE_TYPE`='MYSQL'; /*!40101 SET character_set_client = @saved_cs_client */; # End of mysqldump ------ DROP TABLE t2; @@ -286,7 +286,7 @@ SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( `a` tinyint(4) DEFAULT NULL -) ENGINE=CONNECT DEFAULT CHARSET=latin1 CONNECTION='mysql://root@localhost:PORT/test/t1' `TABLE_TYPE`='MYSQL' +) ENGINE=CONNECT DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci CONNECTION='mysql://root@localhost:PORT/test/t1' `TABLE_TYPE`='MYSQL' SELECT * FROM t2; a 10 diff --git a/storage/connect/mysql-test/connect/r/mysql_discovery.result b/storage/connect/mysql-test/connect/r/mysql_discovery.result index 32bd4761f37..1c9f83cd95f 100644 --- a/storage/connect/mysql-test/connect/r/mysql_discovery.result +++ b/storage/connect/mysql-test/connect/r/mysql_discovery.result @@ -23,7 +23,7 @@ t1 CREATE TABLE `t1` ( `a\\b` int(11) NOT NULL DEFAULT 2, `a\\` int(10) unsigned DEFAULT NULL, `name` varchar(32) DEFAULT 'name' -) ENGINE=CONNECT DEFAULT CHARSET=latin1 CONNECTION='mysql://root@127.0.0.1:SLAVE_PORT/test/t1' `TABLE_TYPE`='MYSQL' +) ENGINE=CONNECT DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci CONNECTION='mysql://root@127.0.0.1:SLAVE_PORT/test/t1' `TABLE_TYPE`='MYSQL' INSERT INTO t1 (id, name) VALUES (1, 'foo'); INSERT INTO t1 (id, name) VALUES (2, 'fee'); SELECT * FROM t1; diff --git a/storage/connect/mysql-test/connect/r/mysql_new.result b/storage/connect/mysql-test/connect/r/mysql_new.result index 0394caac8af..4d4006eea2c 100644 --- a/storage/connect/mysql-test/connect/r/mysql_new.result +++ b/storage/connect/mysql-test/connect/r/mysql_new.result @@ -39,7 +39,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `x` int(11) DEFAULT NULL, `y` char(10) DEFAULT NULL -) ENGINE=CONNECT DEFAULT CHARSET=latin1 CONNECTION='mysql://root@127.0.0.1:SLAVE_PORT/test/t1' `TABLE_TYPE`=MYSQL +) ENGINE=CONNECT DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci CONNECTION='mysql://root@127.0.0.1:SLAVE_PORT/test/t1' `TABLE_TYPE`=MYSQL SELECT * FROM t1; ERROR HY000: Got error 174 '(1054) Unknown column 'x' in 'field list' [SELECT `x`, `y` FROM `t1`]' from CONNECT DROP TABLE t1; @@ -64,7 +64,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` char(10) DEFAULT NULL -) ENGINE=CONNECT DEFAULT CHARSET=latin1 CONNECTION='mysql://root@127.0.0.1:SLAVE_PORT/test/t1' `TABLE_TYPE`='MYSQL' +) ENGINE=CONNECT DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci CONNECTION='mysql://root@127.0.0.1:SLAVE_PORT/test/t1' `TABLE_TYPE`='MYSQL' SELECT * FROM t1; a b NULL NULL @@ -80,7 +80,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` char(10) DEFAULT NULL -) ENGINE=CONNECT DEFAULT CHARSET=latin1 `TABLE_TYPE`=MYSQL `TABNAME`='t1' `OPTION_LIST`='host=127.0.0.1,user=root,port=SLAVE_PORT' +) ENGINE=CONNECT DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci `TABLE_TYPE`=MYSQL `TABNAME`='t1' `OPTION_LIST`='host=127.0.0.1,user=root,port=SLAVE_PORT' SELECT * FROM t1; a b NULL NULL @@ -96,7 +96,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) NOT NULL, `b` char(10) NOT NULL -) ENGINE=CONNECT DEFAULT CHARSET=latin1 `TABLE_TYPE`=MYSQL `OPTION_LIST`='host=127.0.0.1,user=root,port=SLAVE_PORT' +) ENGINE=CONNECT DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci `TABLE_TYPE`=MYSQL `OPTION_LIST`='host=127.0.0.1,user=root,port=SLAVE_PORT' SELECT * FROM t1; a b 0 @@ -112,7 +112,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` char(10) DEFAULT NULL, `b` int(11) DEFAULT NULL -) ENGINE=CONNECT DEFAULT CHARSET=latin1 CONNECTION='mysql://root@127.0.0.1:SLAVE_PORT/test/t1' `TABLE_TYPE`=MYSQL +) ENGINE=CONNECT DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci CONNECTION='mysql://root@127.0.0.1:SLAVE_PORT/test/t1' `TABLE_TYPE`=MYSQL SELECT * FROM t1; a b NULL NULL @@ -138,7 +138,7 @@ t1 CREATE TABLE `t1` ( `f` float DEFAULT NULL, `g` double DEFAULT NULL, `h` decimal(20,5) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci INSERT INTO t1 VALUES(100,3333,41235,1234567890,235000000000,3.14159265,3.14159265,3141.59265); connection master; CREATE TABLE t1 ENGINE=CONNECT TABLE_TYPE=MYSQL @@ -154,7 +154,7 @@ t1 CREATE TABLE `t1` ( `f` double DEFAULT NULL, `g` double DEFAULT NULL, `h` decimal(20,5) DEFAULT NULL -) ENGINE=CONNECT DEFAULT CHARSET=latin1 `TABLE_TYPE`='MYSQL' `OPTION_LIST`='host=127.0.0.1,user=root,port=SLAVE_PORT' +) ENGINE=CONNECT DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci `TABLE_TYPE`='MYSQL' `OPTION_LIST`='host=127.0.0.1,user=root,port=SLAVE_PORT' SELECT * FROM t1; a b c d e f g h 100 3333 41235 1234567890 235000000000 3.14159 3.14159265 3141.59265 @@ -170,7 +170,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` char(12) DEFAULT NULL, `b` varchar(12) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci INSERT INTO t1 VALUES('Welcome','Hello, World'); SELECT * FROM t1; a b @@ -183,7 +183,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` char(12) DEFAULT NULL, `b` varchar(12) DEFAULT NULL -) ENGINE=CONNECT DEFAULT CHARSET=latin1 CONNECTION='mysql://root@127.0.0.1:SLAVE_PORT' `TABLE_TYPE`='MYSQL' +) ENGINE=CONNECT DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci CONNECTION='mysql://root@127.0.0.1:SLAVE_PORT' `TABLE_TYPE`='MYSQL' SELECT * FROM t1; a b Welcome Hello, World @@ -202,7 +202,7 @@ t1 CREATE TABLE `t1` ( `c` time DEFAULT NULL, `d` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), `e` year(4) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci INSERT IGNORE INTO t1 VALUES('2003-05-27 10:45:23','2003-05-27 10:45:23','2003-05-27 10:45:23','2003-05-27 10:45:23','2003-05-27 10:45:23'); Warnings: Note 1265 Data truncated for column 'a' at row 1 @@ -222,7 +222,7 @@ t1 CREATE TABLE `t1` ( `c` time DEFAULT NULL, `d` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), `e` year(4) DEFAULT NULL -) ENGINE=CONNECT DEFAULT CHARSET=latin1 CONNECTION='mysql://root@127.0.0.1:SLAVE_PORT' `TABLE_TYPE`='MYSQL' +) ENGINE=CONNECT DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci CONNECTION='mysql://root@127.0.0.1:SLAVE_PORT' `TABLE_TYPE`='MYSQL' SELECT * FROM t1; a b c d e 2003-05-27 2003-05-27 10:45:23 10:45:23 2003-05-27 10:45:23 2003 diff --git a/storage/connect/mysql-test/connect/r/odbc.result b/storage/connect/mysql-test/connect/r/odbc.result index 4ca7e2095df..442fe36a0e4 100644 --- a/storage/connect/mysql-test/connect/r/odbc.result +++ b/storage/connect/mysql-test/connect/r/odbc.result @@ -6,7 +6,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `Name` varchar(256) NOT NULL, `Description` varchar(256) DEFAULT NULL -) ENGINE=CONNECT DEFAULT CHARSET=latin1 `TABLE_TYPE`='ODBC' `CATFUNC`='Sources' +) ENGINE=CONNECT DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci `TABLE_TYPE`='ODBC' `CATFUNC`='Sources' DROP TABLE t1; CREATE TABLE t1 ENGINE=CONNECT TABLE_TYPE=ODBC CATFUNC=Drivers; SHOW CREATE TABLE t1; @@ -14,7 +14,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `Description` char(128) NOT NULL, `Attributes` varchar(256) DEFAULT NULL -) ENGINE=CONNECT DEFAULT CHARSET=latin1 `TABLE_TYPE`='ODBC' `CATFUNC`='Drivers' +) ENGINE=CONNECT DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci `TABLE_TYPE`='ODBC' `CATFUNC`='Drivers' DROP TABLE t1; CREATE TABLE t1 ENGINE=CONNECT TABLE_TYPE=ODBC CATFUNC=Tables CONNECTION='Not important'; SHOW CREATE TABLE t1; @@ -25,7 +25,7 @@ t1 CREATE TABLE `t1` ( `Table_Name` char(128) NOT NULL, `Table_Type` char(16) NOT NULL, `Remark` char(255) DEFAULT NULL -) ENGINE=CONNECT DEFAULT CHARSET=latin1 CONNECTION='Not important' `TABLE_TYPE`='ODBC' `CATFUNC`='Tables' +) ENGINE=CONNECT DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci CONNECTION='Not important' `TABLE_TYPE`='ODBC' `CATFUNC`='Tables' DROP TABLE t1; CREATE TABLE t1 ENGINE=CONNECT TABLE_TYPE=ODBC CATFUNC=Columns CONNECTION='Not important'; SHOW CREATE TABLE t1; @@ -43,5 +43,5 @@ t1 CREATE TABLE `t1` ( `Radix` smallint(6) DEFAULT NULL, `Nullable` smallint(6) NOT NULL, `Remarks` char(255) DEFAULT NULL -) ENGINE=CONNECT DEFAULT CHARSET=latin1 CONNECTION='Not important' `TABLE_TYPE`='ODBC' `CATFUNC`='Columns' +) ENGINE=CONNECT DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci CONNECTION='Not important' `TABLE_TYPE`='ODBC' `CATFUNC`='Columns' DROP TABLE t1; diff --git a/storage/connect/mysql-test/connect/r/vec.result b/storage/connect/mysql-test/connect/r/vec.result index 51fb8aeee77..52c10b6c59d 100644 --- a/storage/connect/mysql-test/connect/r/vec.result +++ b/storage/connect/mysql-test/connect/r/vec.result @@ -14,7 +14,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) NOT NULL, `b` char(10) NOT NULL -) ENGINE=CONNECT DEFAULT CHARSET=latin1 `TABLE_TYPE`=VEC `FILE_NAME`='t1vec' +) ENGINE=CONNECT DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci `TABLE_TYPE`=VEC `FILE_NAME`='t1vec' SELECT * FROM t1; a b Warnings: @@ -54,7 +54,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) NOT NULL, `b` char(10) NOT NULL -) ENGINE=CONNECT DEFAULT CHARSET=latin1 MAX_ROWS=10 `TABLE_TYPE`=VEC `FILE_NAME`='t1vec' +) ENGINE=CONNECT DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci MAX_ROWS=10 `TABLE_TYPE`=VEC `FILE_NAME`='t1vec' SELECT * FROM t1; a b Warnings: @@ -99,7 +99,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) NOT NULL, `b` char(10) NOT NULL -) ENGINE=CONNECT DEFAULT CHARSET=latin1 MAX_ROWS=10 `TABLE_TYPE`=VEC `FILE_NAME`='t1vec' `READONLY`=yes +) ENGINE=CONNECT DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci MAX_ROWS=10 `TABLE_TYPE`=VEC `FILE_NAME`='t1vec' `READONLY`=yes INSERT INTO t1 VALUES (4,'test04'); ERROR HY000: Table 't1' is read only UPDATE t1 SET b='test04' WHERE a=3; @@ -114,7 +114,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) NOT NULL, `b` char(10) NOT NULL -) ENGINE=CONNECT DEFAULT CHARSET=latin1 MAX_ROWS=10 `TABLE_TYPE`=VEC `FILE_NAME`='t1vec' `READONLY`=no +) ENGINE=CONNECT DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci MAX_ROWS=10 `TABLE_TYPE`=VEC `FILE_NAME`='t1vec' `READONLY`=no INSERT INTO t1 VALUES (4,'test04'); UPDATE t1 SET b='test04a' WHERE a=4; DELETE FROM t1 WHERE a=0; diff --git a/storage/connect/mysql-test/connect/r/xml.result b/storage/connect/mysql-test/connect/r/xml.result index 575c903bbbc..d09e531828f 100644 --- a/storage/connect/mysql-test/connect/r/xml.result +++ b/storage/connect/mysql-test/connect/r/xml.result @@ -285,7 +285,7 @@ SHOW CREATE TABLE t1; Table t1 Create Table CREATE TABLE `t1` ( `c` char(16) DEFAULT NULL -) ENGINE=CONNECT DEFAULT CHARSET=latin1 `TABLE_TYPE`=XML `FILE_NAME`='latin1.xml' `OPTION_LIST`='xmlsup=domdoc' `DATA_CHARSET`=utf8 +) ENGINE=CONNECT DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci `TABLE_TYPE`=XML `FILE_NAME`='latin1.xml' `OPTION_LIST`='xmlsup=domdoc' `DATA_CHARSET`=utf8 SELECT c, HEX(c) FROM t1; c ÁÂÃÄÅÆÇ HEX(c) C1C2C3C4C5C6C7 diff --git a/storage/connect/mysql-test/connect/r/xml2.result b/storage/connect/mysql-test/connect/r/xml2.result index 66ef5f15091..3f82ed1adff 100644 --- a/storage/connect/mysql-test/connect/r/xml2.result +++ b/storage/connect/mysql-test/connect/r/xml2.result @@ -285,7 +285,7 @@ SHOW CREATE TABLE t1; Table t1 Create Table CREATE TABLE `t1` ( `c` char(16) DEFAULT NULL -) ENGINE=CONNECT DEFAULT CHARSET=latin1 `TABLE_TYPE`=XML `FILE_NAME`='latin1.xml' `OPTION_LIST`='xmlsup=libxml2' `DATA_CHARSET`=utf8 +) ENGINE=CONNECT DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci `TABLE_TYPE`=XML `FILE_NAME`='latin1.xml' `OPTION_LIST`='xmlsup=libxml2' `DATA_CHARSET`=utf8 SELECT c, HEX(c) FROM t1; c ÁÂÃÄÅÆÇ HEX(c) C1C2C3C4C5C6C7 diff --git a/storage/connect/mysql-test/connect/t/bson.test b/storage/connect/mysql-test/connect/t/bson.test index ab38cab73fc..173435d79d1 100644 --- a/storage/connect/mysql-test/connect/t/bson.test +++ b/storage/connect/mysql-test/connect/t/bson.test @@ -282,6 +282,29 @@ SELECT * FROM t1; SELECT * FROM t1 WHERE WEEK = 4; DROP TABLE t1, t2, t3, t4; +--echo # +--echo # MDEV-29426 memory leak on "SHOW INDEX" +--echo # +CREATE TABLE t1 +( + ISBN CHAR(15) NOT NULL, + Language CHAR(2) JPATH='$.LANG', + Subject CHAR(32) JPATH='$.SUBJECT', + AuthorFN CHAR(128) JPATH='$.AUTHOR[*].FIRSTNAME', + AuthorLN CHAR(128) JPATH='$.AUTHOR[*].LASTNAME', + Title CHAR(32) JPATH='$.TITLE', + Translation CHAR(32) JPATH='$.TRANSLATED.PREFIX', + TranslatorFN CHAR(80) JPATH='$.TRANSLATED.TRANSLATOR.FIRSTNAME', + TranslatorLN CHAR(80) JPATH='$.TRANSLATED.TRANSLATOR.LASTNAME', + Publisher CHAR(20) JPATH='$.PUBLISHER.NAME', + Location CHAR(16) JPATH='$.PUBLISHER.PLACE', + Year int(4) JPATH='$.DATEPUB', + INDEX IX(ISBN) +) +ENGINE=CONNECT TABLE_TYPE=BSON FILE_NAME='bib0.json' LRECL=320 OPTION_LIST='Pretty=0'; +SHOW INDEX FROM t1; +DROP TABLE t1; + # # Clean up # diff --git a/storage/connect/mysql-test/connect/t/json.test b/storage/connect/mysql-test/connect/t/json.test index 8b42ef9cfab..80306fc5480 100644 --- a/storage/connect/mysql-test/connect/t/json.test +++ b/storage/connect/mysql-test/connect/t/json.test @@ -282,6 +282,30 @@ SELECT * FROM t1; SELECT * FROM t1 WHERE WEEK = 4; DROP TABLE t1, t2, t3, t4; + +--echo # +--echo # MDEV-29426 memory leak on "SHOW INDEX" +--echo # +CREATE TABLE t1 +( + ISBN CHAR(15) NOT NULL, + Language CHAR(2) JPATH='$.LANG', + Subject CHAR(32) JPATH='$.SUBJECT', + AuthorFN CHAR(128) JPATH='$.AUTHOR[*].FIRSTNAME', + AuthorLN CHAR(128) JPATH='$.AUTHOR[*].LASTNAME', + Title CHAR(32) JPATH='$.TITLE', + Translation CHAR(32) JPATH='$.TRANSLATED.PREFIX', + TranslatorFN CHAR(80) JPATH='$.TRANSLATED.TRANSLATOR.FIRSTNAME', + TranslatorLN CHAR(80) JPATH='$.TRANSLATED.TRANSLATOR.LASTNAME', + Publisher CHAR(20) JPATH='$.PUBLISHER.NAME', + Location CHAR(16) JPATH='$.PUBLISHER.PLACE', + Year int(4) JPATH='$.DATEPUB', + INDEX IX(ISBN) +) +ENGINE=CONNECT TABLE_TYPE=JSON FILE_NAME='bib0.json' LRECL=320 OPTION_LIST='Pretty=0'; +SHOW INDEX FROM t1; +DROP TABLE t1; + # # Clean up # diff --git a/storage/innobase/CMakeLists.txt b/storage/innobase/CMakeLists.txt index cc1ec1e302a..356be99bb75 100644 --- a/storage/innobase/CMakeLists.txt +++ b/storage/innobase/CMakeLists.txt @@ -17,9 +17,129 @@ # This is the CMakeLists for InnoDB +INCLUDE(CheckFunctionExists) +INCLUDE(CheckCSourceCompiles) +INCLUDE(CheckCSourceRuns) +INCLUDE(lz4.cmake) +INCLUDE(lzo.cmake) +INCLUDE(lzma.cmake) +INCLUDE(bzip2.cmake) +INCLUDE(snappy.cmake) +INCLUDE(numa) +INCLUDE(TestBigEndian) +MYSQL_CHECK_LZ4() +MYSQL_CHECK_LZO() +MYSQL_CHECK_LZMA() +MYSQL_CHECK_BZIP2() +MYSQL_CHECK_SNAPPY() +MYSQL_CHECK_NUMA() -INCLUDE(innodb.cmake) +INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake) + +IF(CMAKE_CROSSCOMPILING) + # Use CHECK_C_SOURCE_COMPILES instead of CHECK_C_SOURCE_RUNS when + # cross-compiling. Not as precise, but usually good enough. + # This only make sense for atomic tests in this file, this trick doesn't + # work in a general case. + MACRO(CHECK_C_SOURCE SOURCE VAR) + CHECK_C_SOURCE_COMPILES("${SOURCE}" "${VAR}") + ENDMACRO() +ELSE() + MACRO(CHECK_C_SOURCE SOURCE VAR) + CHECK_C_SOURCE_RUNS("${SOURCE}" "${VAR}") + ENDMACRO() +ENDIF() + +# OS tests +IF(UNIX) + IF(CMAKE_SYSTEM_NAME STREQUAL "Linux") + ADD_DEFINITIONS("-D_GNU_SOURCE=1") + IF(HAVE_LIBNUMA) + LINK_LIBRARIES(numa) + ENDIF() + ENDIF() +ENDIF() + +# Enable InnoDB's UNIV_DEBUG in debug builds +SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DUNIV_DEBUG") + +OPTION(WITH_INNODB_AHI "Include innodb_adaptive_hash_index" ON) +OPTION(WITH_INNODB_ROOT_GUESS "Cache index root block descriptors" ON) +IF(WITH_INNODB_AHI) + ADD_DEFINITIONS(-DBTR_CUR_HASH_ADAPT -DBTR_CUR_ADAPT) + IF(NOT WITH_INNODB_ROOT_GUESS) + MESSAGE(WARNING "WITH_INNODB_AHI implies WITH_INNODB_ROOT_GUESS") + SET(WITH_INNODB_ROOT_GUESS ON) + ENDIF() +ELSEIF(WITH_INNODB_ROOT_GUESS) + ADD_DEFINITIONS(-DBTR_CUR_ADAPT) +ENDIF() +ADD_FEATURE_INFO(INNODB_AHI WITH_INNODB_AHI "InnoDB Adaptive Hash Index") +ADD_FEATURE_INFO(INNODB_ROOT_GUESS WITH_INNODB_ROOT_GUESS + "Cache index root block descriptors in InnoDB") + +OPTION(WITH_INNODB_EXTRA_DEBUG "Enable extra InnoDB debug checks" OFF) +IF(WITH_INNODB_EXTRA_DEBUG) + ADD_DEFINITIONS(-DUNIV_ZIP_DEBUG) +ENDIF() +ADD_FEATURE_INFO(INNODB_EXTRA_DEBUG WITH_INNODB_EXTRA_DEBUG "Extra InnoDB debug checks") + + +CHECK_FUNCTION_EXISTS(sched_getcpu HAVE_SCHED_GETCPU) +IF(HAVE_SCHED_GETCPU) + ADD_DEFINITIONS(-DHAVE_SCHED_GETCPU=1) +ENDIF() + +IF(HAVE_FALLOC_PUNCH_HOLE_AND_KEEP_SIZE) + ADD_DEFINITIONS(-DHAVE_FALLOC_PUNCH_HOLE_AND_KEEP_SIZE=1) +ENDIF() + +IF (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR + CMAKE_CXX_COMPILER_ID STREQUAL "GNU") + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wconversion -Wno-sign-conversion") + SET_SOURCE_FILES_PROPERTIES(fts/fts0pars.cc + PROPERTIES COMPILE_FLAGS -Wno-conversion) +ENDIF() + +IF(NOT MSVC) + # Work around MDEV-18417, MDEV-18656, MDEV-18417 + IF(WITH_ASAN AND CMAKE_COMPILER_IS_GNUCC AND + CMAKE_C_COMPILER_VERSION VERSION_LESS "6.0.0") + SET_SOURCE_FILES_PROPERTIES(trx/trx0rec.cc PROPERTIES COMPILE_FLAGS -O1) + ENDIF() +ENDIF(NOT MSVC) + +CHECK_FUNCTION_EXISTS(vasprintf HAVE_VASPRINTF) + +# Include directories under innobase +INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/storage/innobase/include + ${CMAKE_SOURCE_DIR}/storage/innobase/handler) + +# Sun Studio bug with -xO2 +IF(CMAKE_CXX_COMPILER_ID MATCHES "SunPro" + AND CMAKE_CXX_FLAGS_RELEASE MATCHES "O2" + AND NOT CMAKE_BUILD_TYPE STREQUAL "Debug") + # Sun Studio 12 crashes with -xO2 flag, but not with higher optimization + # -xO3 + SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_SOURCE_DIR}/rem/rem0rec.cc + PROPERTIES COMPILE_FLAGS -xO3) +ENDIF() + + +IF(MSVC) + # Avoid "unreferenced label" warning in generated file + GET_FILENAME_COMPONENT(_SRC_DIR ${CMAKE_CURRENT_LIST_FILE} PATH) + SET_SOURCE_FILES_PROPERTIES(${_SRC_DIR}/pars/pars0grm.c + PROPERTIES COMPILE_FLAGS "/wd4102") + SET_SOURCE_FILES_PROPERTIES(${_SRC_DIR}/pars/lexyy.c + PROPERTIES COMPILE_FLAGS "/wd4003") +ENDIF() + +# Include directories under innobase +INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/storage/innobase/include + ${CMAKE_SOURCE_DIR}/storage/innobase/handler + ${CMAKE_SOURCE_DIR}/libbinlogevents/include) INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/tpool) SET(INNOBASE_SOURCES diff --git a/storage/innobase/btr/btr0btr.cc b/storage/innobase/btr/btr0btr.cc index 3e48955e85a..ae769715a3b 100644 --- a/storage/innobase/btr/btr0btr.cc +++ b/storage/innobase/btr/btr0btr.cc @@ -3341,6 +3341,7 @@ btr_lift_page_up( ut_ad(!page_has_siblings(page)); ut_ad(mtr->memo_contains_flagged(block, MTR_MEMO_PAGE_X_FIX)); + ut_ad(!page_is_empty(page)); page_level = btr_page_get_level(page); root_page_no = dict_index_get_page(index); @@ -3427,11 +3428,21 @@ btr_lift_page_up( if (index->is_instant() && father_block->page.id().page_no() == root_page_no) { ut_ad(!father_page_zip); + + if (page_is_leaf(page)) { + const rec_t* rec = page_rec_get_next( + page_get_infimum_rec(page)); + ut_ad(rec_is_metadata(rec, *index)); + if (rec_is_add_metadata(rec, *index) + && page_get_n_recs(page) == 1) { + index->clear_instant_add(); + goto copied; + } + } + btr_set_instant(father_block, *index, mtr); } - page_level++; - /* Copy the records to the father page one by one. */ if (0 #ifdef UNIV_ZIP_COPY @@ -3475,6 +3486,7 @@ btr_lift_page_up( } } +copied: if (index->has_locking()) { const page_id_t id{block->page.id()}; /* Free predicate page locks on the block */ @@ -3485,6 +3497,8 @@ btr_lift_page_up( } } + page_level++; + /* Go upward to root page, decrementing levels by one. */ for (i = lift_father_up ? 1 : 0; i < n_blocks; i++, page_level++) { ut_ad(btr_page_get_level(blocks[i]->page.frame) diff --git a/storage/innobase/fil/fil0fil.cc b/storage/innobase/fil/fil0fil.cc index 95c9987ae9d..2cbc16b7b6e 100644 --- a/storage/innobase/fil/fil0fil.cc +++ b/storage/innobase/fil/fil0fil.cc @@ -48,7 +48,7 @@ Created 10/25/1995 Heikki Tuuri #include "ibuf0ibuf.h" #include "buf0flu.h" #include "log.h" -#ifdef UNIV_LINUX +#ifdef __linux__ # include <sys/types.h> # include <sys/sysmacros.h> # include <dirent.h> @@ -1209,7 +1209,7 @@ void fil_system_t::create(ulint hash_size) spaces.create(hash_size); fil_space_crypt_init(); -#ifdef UNIV_LINUX +#ifdef __linux__ ssd.clear(); char fn[sizeof(dirent::d_name) + sizeof "/sys/block/" "/queue/rotational"]; @@ -1289,10 +1289,10 @@ void fil_system_t::close() ut_ad(!spaces.array); -#ifdef UNIV_LINUX +#ifdef __linux__ ssd.clear(); ssd.shrink_to_fit(); -#endif /* UNIV_LINUX */ +#endif /* __linux__ */ } /** Extend all open data files to the recovered size */ diff --git a/storage/innobase/handler/i_s.cc b/storage/innobase/handler/i_s.cc index dadfa1e2b12..82b8968876f 100644 --- a/storage/innobase/handler/i_s.cc +++ b/storage/innobase/handler/i_s.cc @@ -6501,6 +6501,8 @@ static int i_s_sys_tablespaces_fill_table(THD *thd, TABLE_LIST *tables, Item*) fil_system.freeze_space_list--; mysql_mutex_unlock(&fil_system.mutex); + if (err == DB_SUCCESS) + err= i_s_sys_tablespaces_fill(thd, *fil_system.temp_space, tables->table); DBUG_RETURN(err); } diff --git a/storage/innobase/include/fil0fil.h b/storage/innobase/include/fil0fil.h index b9db9afdb5e..551768c3a22 100644 --- a/storage/innobase/include/fil0fil.h +++ b/storage/innobase/include/fil0fil.h @@ -1456,7 +1456,7 @@ struct fil_system_t { private: bool m_initialised; -#ifdef UNIV_LINUX +#ifdef __linux__ /** available block devices that reside on non-rotational storage */ std::vector<dev_t> ssd; public: diff --git a/storage/innobase/include/univ.i b/storage/innobase/include/univ.i index da9273c041e..1dffd25b27f 100644 --- a/storage/innobase/include/univ.i +++ b/storage/innobase/include/univ.i @@ -453,7 +453,7 @@ contains the sum of the following flag and the locally stored len. */ #endif /* CHECK FOR GCC VER_GT_2 */ /* Some macros to improve branch prediction and reduce cache misses */ -#if defined(COMPILER_HINTS) && defined(__GNUC__) +#ifdef __GNUC__ /* Tell the compiler that 'expr' probably evaluates to 'constant'. */ # define UNIV_EXPECT(expr,constant) __builtin_expect(expr, constant) /* Tell the compiler that a pointer is likely to be NULL */ @@ -473,16 +473,11 @@ it is read or written. */ # define UNIV_EXPECT(expr,value) (expr) # define UNIV_LIKELY_NULL(expr) (expr) -# if defined(COMPILER_HINTS) //# define UNIV_PREFETCH_R(addr) sun_prefetch_read_many((void*) addr) -# define UNIV_PREFETCH_R(addr) ((void) 0) -# define UNIV_PREFETCH_RW(addr) sun_prefetch_write_many(addr) -# else -# define UNIV_PREFETCH_R(addr) ((void) 0) -# define UNIV_PREFETCH_RW(addr) ((void) 0) -# endif /* COMPILER_HINTS */ +# define UNIV_PREFETCH_R(addr) ((void) 0) +# define UNIV_PREFETCH_RW(addr) sun_prefetch_write_many(addr) -# elif defined _MSC_VER && defined COMPILER_HINTS +# elif defined _MSC_VER # define UNIV_EXPECT(expr,value) (expr) # define UNIV_LIKELY_NULL(expr) (expr) # if defined _M_IX86 || defined _M_X64 diff --git a/storage/innobase/innodb.cmake b/storage/innobase/innodb.cmake deleted file mode 100644 index ae83fe8f97d..00000000000 --- a/storage/innobase/innodb.cmake +++ /dev/null @@ -1,155 +0,0 @@ -# Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved. -# Copyright (c) 2017, 2022, MariaDB Corporation. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# This is the CMakeLists for InnoDB - -INCLUDE(CheckFunctionExists) -INCLUDE(CheckCSourceCompiles) -INCLUDE(CheckCSourceRuns) -INCLUDE(lz4.cmake) -INCLUDE(lzo.cmake) -INCLUDE(lzma.cmake) -INCLUDE(bzip2.cmake) -INCLUDE(snappy.cmake) -INCLUDE(numa) -INCLUDE(TestBigEndian) - -MYSQL_CHECK_LZ4() -MYSQL_CHECK_LZO() -MYSQL_CHECK_LZMA() -MYSQL_CHECK_BZIP2() -MYSQL_CHECK_SNAPPY() -MYSQL_CHECK_NUMA() - -INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake) - -IF(CMAKE_CROSSCOMPILING) - # Use CHECK_C_SOURCE_COMPILES instead of CHECK_C_SOURCE_RUNS when - # cross-compiling. Not as precise, but usually good enough. - # This only make sense for atomic tests in this file, this trick doesn't - # work in a general case. - MACRO(CHECK_C_SOURCE SOURCE VAR) - CHECK_C_SOURCE_COMPILES("${SOURCE}" "${VAR}") - ENDMACRO() -ELSE() - MACRO(CHECK_C_SOURCE SOURCE VAR) - CHECK_C_SOURCE_RUNS("${SOURCE}" "${VAR}") - ENDMACRO() -ENDIF() - -# OS tests -IF(UNIX) - IF(CMAKE_SYSTEM_NAME STREQUAL "Linux") - ADD_DEFINITIONS("-DUNIV_LINUX -D_GNU_SOURCE=1") - IF(HAVE_LIBNUMA) - LINK_LIBRARIES(numa) - ENDIF() - ELSEIF(CMAKE_SYSTEM_NAME MATCHES "HP*") - ADD_DEFINITIONS("-DUNIV_HPUX") - ELSEIF(CMAKE_SYSTEM_NAME STREQUAL "AIX") - ADD_DEFINITIONS("-DUNIV_AIX") - ELSEIF(CMAKE_SYSTEM_NAME STREQUAL "SunOS") - ADD_DEFINITIONS("-DUNIV_SOLARIS") - ENDIF() -ENDIF() - -OPTION(INNODB_COMPILER_HINTS "Compile InnoDB with compiler hints" ON) -MARK_AS_ADVANCED(INNODB_COMPILER_HINTS) - -IF(INNODB_COMPILER_HINTS) - ADD_DEFINITIONS("-DCOMPILER_HINTS") -ENDIF() -ADD_FEATURE_INFO(INNODB_COMPILER_HINTS INNODB_COMPILER_HINTS "InnoDB compiled with compiler hints") - -# Enable InnoDB's UNIV_DEBUG in debug builds -SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DUNIV_DEBUG") - -OPTION(WITH_INNODB_AHI "Include innodb_adaptive_hash_index" ON) -OPTION(WITH_INNODB_ROOT_GUESS "Cache index root block descriptors" ON) -IF(WITH_INNODB_AHI) - ADD_DEFINITIONS(-DBTR_CUR_HASH_ADAPT -DBTR_CUR_ADAPT) - IF(NOT WITH_INNODB_ROOT_GUESS) - MESSAGE(WARNING "WITH_INNODB_AHI implies WITH_INNODB_ROOT_GUESS") - SET(WITH_INNODB_ROOT_GUESS ON) - ENDIF() -ELSEIF(WITH_INNODB_ROOT_GUESS) - ADD_DEFINITIONS(-DBTR_CUR_ADAPT) -ENDIF() -ADD_FEATURE_INFO(INNODB_AHI WITH_INNODB_AHI "InnoDB Adaptive Hash Index") -ADD_FEATURE_INFO(INNODB_ROOT_GUESS WITH_INNODB_ROOT_GUESS - "Cache index root block descriptors in InnoDB") - -OPTION(WITH_INNODB_EXTRA_DEBUG "Enable extra InnoDB debug checks" OFF) -IF(WITH_INNODB_EXTRA_DEBUG) - ADD_DEFINITIONS(-DUNIV_ZIP_DEBUG) -ENDIF() -ADD_FEATURE_INFO(INNODB_EXTRA_DEBUG WITH_INNODB_EXTRA_DEBUG "Extra InnoDB debug checks") - - -CHECK_FUNCTION_EXISTS(sched_getcpu HAVE_SCHED_GETCPU) -IF(HAVE_SCHED_GETCPU) - ADD_DEFINITIONS(-DHAVE_SCHED_GETCPU=1) -ENDIF() - -IF(HAVE_FALLOC_PUNCH_HOLE_AND_KEEP_SIZE) - ADD_DEFINITIONS(-DHAVE_FALLOC_PUNCH_HOLE_AND_KEEP_SIZE=1) -ENDIF() - -IF (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR - CMAKE_CXX_COMPILER_ID STREQUAL "GNU") - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wconversion -Wno-sign-conversion") - SET_SOURCE_FILES_PROPERTIES(fts/fts0pars.cc - PROPERTIES COMPILE_FLAGS -Wno-conversion) -ENDIF() - -IF(NOT MSVC) - # Work around MDEV-18417, MDEV-18656, MDEV-18417 - IF(WITH_ASAN AND CMAKE_COMPILER_IS_GNUCC AND - CMAKE_C_COMPILER_VERSION VERSION_LESS "6.0.0") - SET_SOURCE_FILES_PROPERTIES(trx/trx0rec.cc PROPERTIES COMPILE_FLAGS -O1) - ENDIF() -ENDIF() - -CHECK_FUNCTION_EXISTS(vasprintf HAVE_VASPRINTF) - -# Include directories under innobase -INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/storage/innobase/include - ${CMAKE_SOURCE_DIR}/storage/innobase/handler) - -# Sun Studio bug with -xO2 -IF(CMAKE_CXX_COMPILER_ID MATCHES "SunPro" - AND CMAKE_CXX_FLAGS_RELEASE MATCHES "O2" - AND NOT CMAKE_BUILD_TYPE STREQUAL "Debug") - # Sun Studio 12 crashes with -xO2 flag, but not with higher optimization - # -xO3 - SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_SOURCE_DIR}/rem/rem0rec.cc - PROPERTIES COMPILE_FLAGS -xO3) -ENDIF() - - -IF(MSVC) - # Avoid "unreferenced label" warning in generated file - GET_FILENAME_COMPONENT(_SRC_DIR ${CMAKE_CURRENT_LIST_FILE} PATH) - SET_SOURCE_FILES_PROPERTIES(${_SRC_DIR}/pars/pars0grm.c - PROPERTIES COMPILE_FLAGS "/wd4102") - SET_SOURCE_FILES_PROPERTIES(${_SRC_DIR}/pars/lexyy.c - PROPERTIES COMPILE_FLAGS "/wd4003") -ENDIF() - -# Include directories under innobase -INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/storage/innobase/include - ${CMAKE_SOURCE_DIR}/storage/innobase/handler - ${CMAKE_SOURCE_DIR}/libbinlogevents/include ) diff --git a/storage/innobase/lock/lock0prdt.cc b/storage/innobase/lock/lock0prdt.cc index 5a12d97411f..2975659138d 100644 --- a/storage/innobase/lock/lock0prdt.cc +++ b/storage/innobase/lock/lock0prdt.cc @@ -799,6 +799,9 @@ lock_place_prdt_page_lock( ut_ad(index->is_spatial()); ut_ad(!dict_index_is_online_ddl(index)); + if (index->table->is_temporary()) { + return DB_SUCCESS; + } /* Another transaction cannot have an implicit lock on the record, because when we come here, we already have modified the clustered diff --git a/storage/innobase/log/log0recv.cc b/storage/innobase/log/log0recv.cc index 7db0fdbefa5..4a1057414e2 100644 --- a/storage/innobase/log/log0recv.cc +++ b/storage/innobase/log/log0recv.cc @@ -393,7 +393,7 @@ page_corrupted: rlen-= ll; l+= ll; ll= mlog_decode_varint_length(*l); - if (UNIV_UNLIKELY(ll > 3 || ll >= rlen)) + if (UNIV_UNLIKELY(ll > 3 || ll > rlen)) goto record_corrupted; size_t data_c= mlog_decode_varint(l); ut_ad(data_c != MLOG_DECODE_ERROR); @@ -420,7 +420,7 @@ page_corrupted: rlen-= ll; l+= ll; ll= mlog_decode_varint_length(*l); - if (UNIV_UNLIKELY(ll > 2 || ll >= rlen)) + if (UNIV_UNLIKELY(ll > 2 || ll > rlen)) goto record_corrupted; size_t data_c= mlog_decode_varint(l); rlen-= ll; diff --git a/storage/innobase/os/os0file.cc b/storage/innobase/os/os0file.cc index 2367b7b0596..dd8c4b0e171 100644 --- a/storage/innobase/os/os0file.cc +++ b/storage/innobase/os/os0file.cc @@ -37,7 +37,7 @@ Created 10/21/1995 Heikki Tuuri #include "os0file.h" #include "sql_const.h" -#ifdef UNIV_LINUX +#ifdef __linux__ # include <sys/types.h> # include <sys/stat.h> #endif @@ -63,7 +63,7 @@ Created 10/21/1995 Heikki Tuuri # include <linux/falloc.h> #endif /* HAVE_FALLOC_PUNCH_HOLE_AND_KEEP_SIZE */ -#if defined(UNIV_LINUX) && defined(HAVE_SYS_IOCTL_H) +#if defined(__linux__) && defined(HAVE_SYS_IOCTL_H) # include <sys/ioctl.h> # ifndef DFS_IOCTL_ATOMIC_WRITE_SET # define DFS_IOCTL_ATOMIC_WRITE_SET _IOW(0x95, 2, uint) @@ -725,7 +725,7 @@ os_file_punch_hole_posix( return(DB_IO_ERROR); -#elif defined(UNIV_SOLARIS) +#elif defined __sun__ // Use F_FREESP @@ -2799,10 +2799,11 @@ os_file_io( @param[in] type IO context @param[in] file handle to an open file @param[out] buf buffer from which to write -@param[in] n number of bytes to read, starting from offset -@param[in] offset file offset from the start where to read +@param[in] n number of bytes to write, starting from offset +@param[in] offset file offset from the start where to write @param[out] err DB_SUCCESS or error code -@return number of bytes written, -1 if error */ +@return number of bytes written +@retval -1 on error */ static MY_ATTRIBUTE((warn_unused_result)) ssize_t os_file_pwrite( @@ -3089,7 +3090,7 @@ os_file_set_nocache( } /* some versions of Solaris may not have DIRECTIO_ON */ -#if defined(UNIV_SOLARIS) && defined(DIRECTIO_ON) +#if defined(__sun__) && defined(DIRECTIO_ON) if (directio(fd, DIRECTIO_ON) == -1) { int errno_save = errno; @@ -3118,7 +3119,7 @@ os_file_set_nocache( << ", continuing anyway."; } } -#endif /* defined(UNIV_SOLARIS) && defined(DIRECTIO_ON) */ +#endif /* defined(__sun__) && defined(DIRECTIO_ON) */ } #endif /* _WIN32 */ @@ -4099,7 +4100,7 @@ void fil_node_t::find_metadata(os_file_t file } if (statbuf) block_size= statbuf->st_blksize; -# ifdef UNIV_LINUX +# ifdef __linux__ on_ssd= statbuf && fil_system.is_ssd(statbuf->st_dev); # endif #endif diff --git a/storage/innobase/row/row0merge.cc b/storage/innobase/row/row0merge.cc index 2b3eecab445..e3f975518a5 100644 --- a/storage/innobase/row/row0merge.cc +++ b/storage/innobase/row/row0merge.cc @@ -1969,8 +1969,6 @@ corrupted_metadata: row_ext_t* ext; page_cur_t* cur = btr_pcur_get_page_cur(&pcur); - mem_heap_empty(row_heap); - stage->n_pk_recs_inc(); if (!page_cur_move_to_next(cur)) { @@ -2004,6 +2002,8 @@ corrupted_rec: goto func_exit; } + mem_heap_empty(row_heap); + if (!mtr_started) { goto scan_next; } @@ -2089,6 +2089,8 @@ end_of_index: goto corrupted_rec; } } + } else { + mem_heap_empty(row_heap); } rec = page_cur_get_rec(cur); @@ -3388,12 +3390,12 @@ row_merge_sort( is used. MDEV-9356: innodb.innodb_bug53290 fails (crashes) on sol10-64 in buildbot. */ -#ifndef UNIV_SOLARIS +#ifndef __sun__ /* Progress report only for "normal" indexes. */ if (!(dup->index->type & DICT_FTS)) { thd_progress_init(trx->mysql_thd, 1); } -#endif /* UNIV_SOLARIS */ +#endif /* __sun__ */ if (global_system_variables.log_warnings > 2) { sql_print_information("InnoDB: Online DDL : merge-sorting" @@ -3406,11 +3408,11 @@ row_merge_sort( /* Report progress of merge sort to MySQL for show processlist progress field */ /* Progress report only for "normal" indexes. */ -#ifndef UNIV_SOLARIS +#ifndef __sun__ if (!(dup->index->type & DICT_FTS)) { thd_progress_report(trx->mysql_thd, file->offset - num_runs, file->offset); } -#endif /* UNIV_SOLARIS */ +#endif /* __sun__ */ error = row_merge(trx, dup, file, block, tmpfd, &num_runs, run_offset, stage, @@ -3436,11 +3438,11 @@ row_merge_sort( ut_free(run_offset); /* Progress report only for "normal" indexes. */ -#ifndef UNIV_SOLARIS +#ifndef __sun__ if (!(dup->index->type & DICT_FTS)) { thd_progress_end(trx->mysql_thd); } -#endif /* UNIV_SOLARIS */ +#endif /* __sun__ */ DBUG_RETURN(error); } diff --git a/storage/innobase/srv/srv0start.cc b/storage/innobase/srv/srv0start.cc index 0ffb665c26d..f2b58fc555f 100644 --- a/storage/innobase/srv/srv0start.cc +++ b/storage/innobase/srv/srv0start.cc @@ -393,12 +393,12 @@ static dberr_t srv_undo_tablespace_create(const char* name) if (!ret) { if (os_file_get_last_error(false) != OS_FILE_ALREADY_EXISTS -#ifdef UNIV_AIX +#ifdef _AIX /* AIX 5.1 after security patch ML7 may have errno set to 0 here, which causes our function to return 100; work around that AIX problem */ && os_file_get_last_error(false) != 100 -#endif /* UNIV_AIX */ +#endif ) { ib::error() << "Can't create UNDO tablespace " << name; diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_column_after.result b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_column_after.result index 46a622a313d..ecfd91bdf5b 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_column_after.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_column_after.result @@ -9,7 +9,7 @@ diaries CREATE TABLE `diaries` ( `id` int(11) NOT NULL AUTO_INCREMENT, `body` varchar(140) DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci ALTER TABLE diaries ADD title VARCHAR(40) AFTER id; SHOW CREATE TABLE diaries; Table Create Table @@ -18,7 +18,7 @@ diaries CREATE TABLE `diaries` ( `title` varchar(40) DEFAULT NULL, `body` varchar(140) DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci INSERT INTO diaries (title, body) values ("groonga (1)", "starting groonga."); SELECT * FROM diaries; id title body diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_column_first.result b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_column_first.result index 8862b023960..404955753f8 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_column_first.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_column_first.result @@ -9,7 +9,7 @@ diaries CREATE TABLE `diaries` ( `id` int(11) NOT NULL AUTO_INCREMENT, `body` varchar(140) DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci ALTER TABLE diaries ADD title VARCHAR(40) FIRST; SHOW CREATE TABLE diaries; Table Create Table @@ -18,7 +18,7 @@ diaries CREATE TABLE `diaries` ( `id` int(11) NOT NULL AUTO_INCREMENT, `body` varchar(140) DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci INSERT INTO diaries (title, body) values ("groonga (1)", "starting groonga."); SELECT * FROM diaries; title id body diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_column_flags_parameter.result b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_column_flags_parameter.result index 6a884f7cb3a..3580dc1bf56 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_column_flags_parameter.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_column_flags_parameter.result @@ -8,7 +8,7 @@ tags CREATE TABLE `tags` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, `name` varchar(64) DEFAULT NULL `FLAGS`='COLUMN_VECTOR', PRIMARY KEY (`id`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci SELECT mroonga_command("dump --dump_plugins no"); mroonga_command("dump --dump_plugins no") table_create mroonga_operations TABLE_NO_KEY diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_column_groonga_type_parameter.result b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_column_groonga_type_parameter.result index 4d52b09fb21..63e34b98c44 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_column_groonga_type_parameter.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_column_groonga_type_parameter.result @@ -11,7 +11,7 @@ bugs CREATE TABLE `bugs` ( `id` int(10) unsigned NOT NULL, `name` varchar(64) DEFAULT NULL `GROONGA_TYPE`='tags', PRIMARY KEY (`id`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci SELECT mroonga_command("dump --dump_plugins no"); mroonga_command("dump --dump_plugins no") table_create bugs TABLE_PAT_KEY UInt32 diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_column_multiple.result b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_column_multiple.result index 1e9c6e445cf..3d89aa1ebea 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_column_multiple.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_column_multiple.result @@ -9,7 +9,7 @@ diaries CREATE TABLE `diaries` ( `id` int(11) NOT NULL AUTO_INCREMENT, `title` varchar(40) DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci INSERT INTO diaries (title) VALUES ("survey"); SELECT * FROM diaries; id title @@ -40,5 +40,5 @@ diaries CREATE TABLE `diaries` ( `title` varchar(40) DEFAULT NULL, `created_at` datetime DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=Mroonga AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb3 +) ENGINE=Mroonga AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci DROP TABLE diaries; diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_column_plain.result b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_column_plain.result index 302b8ae9092..a3762372f89 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_column_plain.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_column_plain.result @@ -9,7 +9,7 @@ diaries CREATE TABLE `diaries` ( `id` int(11) NOT NULL AUTO_INCREMENT, `title` varchar(40) DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci INSERT INTO diaries (title) VALUES ("survey"); SELECT * FROM diaries; id title @@ -33,5 +33,5 @@ diaries CREATE TABLE `diaries` ( `title` varchar(40) DEFAULT NULL, `body` varchar(140) DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=Mroonga AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb3 +) ENGINE=Mroonga AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci DROP TABLE diaries; diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_index_unique_duplicated.result b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_index_unique_duplicated.result index 0676b9f2c3c..3938c6fc7c4 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_index_unique_duplicated.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_index_unique_duplicated.result @@ -9,7 +9,7 @@ SHOW CREATE TABLE ids; Table Create Table ids CREATE TABLE `ids` ( `id` int(11) DEFAULT NULL -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci SELECT * FROM ids; id 1 diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_index_unique_multiple_column_duplicated.result b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_index_unique_multiple_column_duplicated.result index 8ab7ef22aca..cf06223a648 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_index_unique_multiple_column_duplicated.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_index_unique_multiple_column_duplicated.result @@ -11,7 +11,7 @@ Table Create Table ids CREATE TABLE `ids` ( `id1` int(11) DEFAULT NULL, `id2` int(11) DEFAULT NULL -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb4 +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci SELECT * FROM ids; id1 id2 1 2 diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_key_multiple_column_with_data.result b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_key_multiple_column_with_data.result index 6253e6f2015..930f1f48c4c 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_key_multiple_column_with_data.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_key_multiple_column_with_data.result @@ -12,7 +12,7 @@ scores CREATE TABLE `scores` ( `name` char(30) NOT NULL, `score` int(11) NOT NULL, PRIMARY KEY (`id`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci INSERT INTO scores (name, score) VALUES("Taro Yamada", 29); INSERT INTO scores (name, score) VALUES("Taro Yamada", -12); INSERT INTO scores (name, score) VALUES("Jiro Yamada", 27); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_primary_key.result b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_primary_key.result index 4810a6221a3..adca183f410 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_primary_key.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_primary_key.result @@ -10,7 +10,7 @@ Table Create Table ids CREATE TABLE `ids` ( `id` int(11) NOT NULL, PRIMARY KEY (`id`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci SELECT * FROM ids WHERE id = 2; id 2 diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_change_column_comment_not_for_mroonga.result b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_change_column_comment_not_for_mroonga.result index 945a76d2ac9..aa90e9ff2eb 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_change_column_comment_not_for_mroonga.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_change_column_comment_not_for_mroonga.result @@ -13,5 +13,5 @@ bugs CREATE TABLE `bugs` ( `id` int(10) unsigned NOT NULL, `tag` varchar(64) DEFAULT NULL COMMENT 'It must consist of only alphabet and number.', PRIMARY KEY (`id`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci DROP TABLE bugs; diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_change_column_have_index.result b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_change_column_have_index.result index e95c518cdc6..7be787aa969 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_change_column_have_index.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_change_column_have_index.result @@ -12,5 +12,5 @@ bugs CREATE TABLE `bugs` ( `title` varchar(64) DEFAULT NULL, PRIMARY KEY (`id`), FULLTEXT KEY `title` (`title`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci DROP TABLE bugs; diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_change_column_rename_after.result b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_change_column_rename_after.result index cb382b25a23..c58ee2b75bd 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_change_column_rename_after.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_change_column_rename_after.result @@ -11,7 +11,7 @@ diaries CREATE TABLE `diaries` ( `title` varchar(40) DEFAULT NULL, `body` varchar(140) DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci ALTER TABLE diaries CHANGE body description VARCHAR(140) AFTER id; SHOW CREATE TABLE diaries; Table Create Table @@ -20,7 +20,7 @@ diaries CREATE TABLE `diaries` ( `description` varchar(140) DEFAULT NULL, `title` varchar(40) DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci INSERT INTO diaries (title, description) values ("groonga (1)", "starting groonga."); SELECT * FROM diaries; id description title diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_change_column_rename_first.result b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_change_column_rename_first.result index 02f299c70f1..68885fa943b 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_change_column_rename_first.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_change_column_rename_first.result @@ -11,7 +11,7 @@ diaries CREATE TABLE `diaries` ( `title` varchar(40) DEFAULT NULL, `body` varchar(140) DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci ALTER TABLE diaries CHANGE body description VARCHAR(140) FIRST; SHOW CREATE TABLE diaries; Table Create Table @@ -20,7 +20,7 @@ diaries CREATE TABLE `diaries` ( `id` int(11) NOT NULL AUTO_INCREMENT, `title` varchar(40) DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci INSERT INTO diaries (title, description) values ("groonga (1)", "starting groonga."); SELECT * FROM diaries; description id title diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_change_column_rename_multiple.result b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_change_column_rename_multiple.result index b572e981f85..af5a2c3ad3c 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_change_column_rename_multiple.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_change_column_rename_multiple.result @@ -11,7 +11,7 @@ diaries CREATE TABLE `diaries` ( `title` varchar(40) DEFAULT NULL, `body` varchar(140) DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci ALTER TABLE diaries CHANGE body description VARCHAR(140) FIRST, CHANGE title subject VARCHAR(40) AFTER internal_id, @@ -23,7 +23,7 @@ diaries CREATE TABLE `diaries` ( `internal_id` int(11) NOT NULL AUTO_INCREMENT, `subject` varchar(40) DEFAULT NULL, PRIMARY KEY (`internal_id`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci INSERT IGNORE INTO diaries (subject, description) VALUES ("groonga (1)", "starting groonga."); SELECT * FROM diaries; diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_change_column_rename_no_order.result b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_change_column_rename_no_order.result index 29e50073ea0..4318f68696f 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_change_column_rename_no_order.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_change_column_rename_no_order.result @@ -11,7 +11,7 @@ diaries CREATE TABLE `diaries` ( `title` varchar(40) DEFAULT NULL, `body` varchar(140) DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci ALTER TABLE diaries CHANGE body description VARCHAR(140); SHOW CREATE TABLE diaries; Table Create Table @@ -20,7 +20,7 @@ diaries CREATE TABLE `diaries` ( `title` varchar(40) DEFAULT NULL, `description` varchar(140) DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci INSERT INTO diaries (title, description) values ("groonga (1)", "starting groonga."); SELECT * FROM diaries; id title description diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_change_engine_decimal.result b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_change_engine_decimal.result index 334492bc80f..a66f0cac998 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_change_engine_decimal.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_change_engine_decimal.result @@ -9,7 +9,7 @@ diaries CREATE TABLE `diaries` ( `id` int(11) NOT NULL AUTO_INCREMENT, `temperature` decimal(6,3) DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci INSERT INTO diaries (temperature) VALUES (21.281); SELECT * FROM diaries; id temperature @@ -31,5 +31,5 @@ diaries CREATE TABLE `diaries` ( `id` int(11) NOT NULL AUTO_INCREMENT, `temperature` decimal(6,3) DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=Mroonga AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb3 +) ENGINE=Mroonga AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci DROP TABLE diaries; diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_drop_column_multiple.result b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_drop_column_multiple.result index cb0fae84851..ea62084db0b 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_drop_column_multiple.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_drop_column_multiple.result @@ -11,7 +11,7 @@ diaries CREATE TABLE `diaries` ( `title` varchar(40) DEFAULT NULL, `body` varchar(140) DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci INSERT INTO diaries (title, body) VALUES ("survey", "will start groonga!"); SELECT * FROM diaries; id title body @@ -24,7 +24,7 @@ Table Create Table diaries CREATE TABLE `diaries` ( `id` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`id`) -) ENGINE=Mroonga AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb3 +) ENGINE=Mroonga AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci SELECT * FROM diaries; id 1 diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_drop_column_one.result b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_drop_column_one.result index 2b51e94c7cf..8b06caa0c36 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_drop_column_one.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_drop_column_one.result @@ -11,7 +11,7 @@ diaries CREATE TABLE `diaries` ( `title` varchar(40) DEFAULT NULL, `body` varchar(140) DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci INSERT INTO diaries (title, body) VALUES ("survey", "will start groonga!"); SELECT * FROM diaries; id title body @@ -23,7 +23,7 @@ diaries CREATE TABLE `diaries` ( `id` int(11) NOT NULL AUTO_INCREMENT, `title` varchar(40) DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=Mroonga AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb3 +) ENGINE=Mroonga AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci SELECT * FROM diaries; id title 1 survey diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_drop_key_multiple_column_with_data.result b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_drop_key_multiple_column_with_data.result index 2521de47ee9..21aca41a569 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_drop_key_multiple_column_with_data.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_drop_key_multiple_column_with_data.result @@ -14,7 +14,7 @@ scores CREATE TABLE `scores` ( `score` int(11) NOT NULL, PRIMARY KEY (`id`), KEY `property` (`name`,`score`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci INSERT INTO scores (name, score) VALUES("Taro Yamada", 29); INSERT INTO scores (name, score) VALUES("Taro Yamada", -12); INSERT INTO scores (name, score) VALUES("Jiro Yamada", 27); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_drop_primary_key.result b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_drop_primary_key.result index 7f255cdf129..95914d303ca 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_drop_primary_key.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_drop_primary_key.result @@ -9,7 +9,7 @@ SHOW CREATE TABLE ids; Table Create Table ids CREATE TABLE `ids` ( `id` int(11) NOT NULL -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci SELECT * FROM ids WHERE id = 2; id 2 diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_fulltext_add_no_primary_key.result b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_fulltext_add_no_primary_key.result index cad33d22837..ac0600e0368 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_fulltext_add_no_primary_key.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_fulltext_add_no_primary_key.result @@ -11,7 +11,7 @@ Table Create Table memos CREATE TABLE `memos` ( `content` varchar(32) DEFAULT NULL, FULLTEXT KEY `content_index` (`content`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci SELECT * FROM memos WHERE MATCH(content) AGAINST("groonga"); content Starting Groonga... diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_modify_column_after.result b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_modify_column_after.result index a0174457c6d..6ef97d89f48 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_modify_column_after.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_modify_column_after.result @@ -11,7 +11,7 @@ diaries CREATE TABLE `diaries` ( `title` varchar(40) DEFAULT NULL, `body` varchar(140) DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci INSERT INTO diaries (title, body) values ("groonga (1)", "starting groonga."); SELECT * FROM diaries; id title body @@ -24,7 +24,7 @@ diaries CREATE TABLE `diaries` ( `body` varchar(140) DEFAULT NULL, `title` varchar(40) DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=Mroonga AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb3 +) ENGINE=Mroonga AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci INSERT INTO diaries (title, body) values ("groonga (2)", "started groonga."); SELECT * FROM diaries; id body title diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_modify_column_first.result b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_modify_column_first.result index 6eef097f3fc..b5d7df8d6ea 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_modify_column_first.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_modify_column_first.result @@ -11,7 +11,7 @@ diaries CREATE TABLE `diaries` ( `title` varchar(40) DEFAULT NULL, `body` varchar(140) DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci INSERT INTO diaries (title, body) values ("groonga (1)", "starting groonga."); SELECT * FROM diaries; id title body @@ -24,7 +24,7 @@ diaries CREATE TABLE `diaries` ( `id` int(11) NOT NULL AUTO_INCREMENT, `title` varchar(40) DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=Mroonga AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb3 +) ENGINE=Mroonga AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci INSERT INTO diaries (title, body) values ("groonga (2)", "started groonga."); SELECT * FROM diaries; body id title diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_modify_column_no_order.result b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_modify_column_no_order.result index 0b79c39100c..884ee68bdac 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_modify_column_no_order.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_modify_column_no_order.result @@ -11,7 +11,7 @@ diaries CREATE TABLE `diaries` ( `title` varchar(40) DEFAULT NULL, `body` varchar(140) DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci INSERT INTO diaries (title, body) values ("groonga (1)", "starting groonga."); SELECT * FROM diaries; id title body @@ -24,7 +24,7 @@ diaries CREATE TABLE `diaries` ( `title` varchar(100) DEFAULT NULL, `body` varchar(140) DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=Mroonga AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb3 +) ENGINE=Mroonga AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci INSERT INTO diaries (title, body) values ("groonga (2)", "started groonga."); SELECT * FROM diaries; id title body diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_spatial.result b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_spatial.result index ac1a096de4a..5ce6dfdede5 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_spatial.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/alter_table_spatial.result @@ -128,5 +128,5 @@ shops CREATE TABLE `shops` ( `location` geometry NOT NULL, PRIMARY KEY (`id`), SPATIAL KEY `location_index` (`location`) -) ENGINE=Mroonga AUTO_INCREMENT=37 DEFAULT CHARSET=latin1 +) ENGINE=Mroonga AUTO_INCREMENT=37 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE shops; diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/auto_increment_table_param.result b/storage/mroonga/mysql-test/mroonga/storage/r/auto_increment_table_param.result index f89b74e571a..f997a9ec10c 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/auto_increment_table_param.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/auto_increment_table_param.result @@ -9,7 +9,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) -) ENGINE=Mroonga AUTO_INCREMENT=34130 DEFAULT CHARSET=latin1 +) ENGINE=Mroonga AUTO_INCREMENT=34130 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci insert into t1 values(null); select c1 from t1 order by c1 desc; c1 @@ -66,5 +66,5 @@ Table Create Table t2 CREATE TABLE `t2` ( `c1` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`c1`) -) ENGINE=Mroonga AUTO_INCREMENT=4 DEFAULT CHARSET=latin1 +) ENGINE=Mroonga AUTO_INCREMENT=4 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table t2; diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/column_comment_index_not_for_mroonga.result b/storage/mroonga/mysql-test/mroonga/storage/r/column_comment_index_not_for_mroonga.result index 6da5689bb2d..e09f4e8378c 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/column_comment_index_not_for_mroonga.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/column_comment_index_not_for_mroonga.result @@ -8,5 +8,5 @@ Table Create Table bugs CREATE TABLE `bugs` ( `id` int(10) unsigned DEFAULT NULL, KEY `id` (`id`) COMMENT 'ID search is required.' -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci DROP TABLE bugs; diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/column_comment_normal_not_for_mroonga.result b/storage/mroonga/mysql-test/mroonga/storage/r/column_comment_normal_not_for_mroonga.result index 0315e500188..01c4f64f439 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/column_comment_normal_not_for_mroonga.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/column_comment_normal_not_for_mroonga.result @@ -9,5 +9,5 @@ bugs CREATE TABLE `bugs` ( `id` int(10) unsigned NOT NULL, `tag` varchar(64) DEFAULT NULL COMMENT 'It must consist of only alphabet and number.', PRIMARY KEY (`id`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci DROP TABLE bugs; diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/column_date_with_index.result b/storage/mroonga/mysql-test/mroonga/storage/r/column_date_with_index.result index feb54705d55..57d2c41742b 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/column_date_with_index.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/column_date_with_index.result @@ -13,7 +13,7 @@ diaries CREATE TABLE `diaries` ( `created_at` date DEFAULT NULL, PRIMARY KEY (`id`), KEY `created_at` (`created_at`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci INSERT INTO diaries (title, created_at) VALUES ("clear day", "2012-01-29"); INSERT INTO diaries (title, created_at) VALUES ("rainy day", "2012-01-30"); INSERT INTO diaries (title, created_at) VALUES ("cloudy day", "2012-01-31"); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/column_date_without_index.result b/storage/mroonga/mysql-test/mroonga/storage/r/column_date_without_index.result index a0c873744a2..26af0dd9e82 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/column_date_without_index.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/column_date_without_index.result @@ -11,7 +11,7 @@ diaries CREATE TABLE `diaries` ( `title` varchar(40) DEFAULT NULL, `created_at` date DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci INSERT INTO diaries (title, created_at) VALUES ("clear day", "2012-01-29"); INSERT INTO diaries (title, created_at) VALUES ("rainy day", "2012-01-30"); INSERT INTO diaries (title, created_at) VALUES ("cloudy day", "2012-01-31"); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/column_enum_less_with_index.result b/storage/mroonga/mysql-test/mroonga/storage/r/column_enum_less_with_index.result index f04f0e25923..abec4ecafba 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/column_enum_less_with_index.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/column_enum_less_with_index.result @@ -10,7 +10,7 @@ items CREATE TABLE `items` ( `name` varchar(255) DEFAULT NULL, `size` enum('small','medium','large') DEFAULT NULL, KEY `size` (`size`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci INSERT INTO items VALUES ("t-shart for child", "small"); INSERT INTO items VALUES ("leadies' coat", "medium"); INSERT INTO items VALUES ("parka", "large"); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/column_enum_many_with_index.result b/storage/mroonga/mysql-test/mroonga/storage/r/column_enum_many_with_index.result index 4fa21cc17aa..d116ff9ee36 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/column_enum_many_with_index.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/column_enum_many_with_index.result @@ -265,7 +265,7 @@ items CREATE TABLE `items` ( `name` varchar(255) DEFAULT NULL, `size` enum('size1','size2','size3','size4','size5','size6','size7','size8','size9','size10','size11','size12','size13','size14','size15','size16','size17','size18','size19','size20','size21','size22','size23','size24','size25','size26','size27','size28','size29','size30','size31','size32','size33','size34','size35','size36','size37','size38','size39','size40','size41','size42','size43','size44','size45','size46','size47','size48','size49','size50','size51','size52','size53','size54','size55','size56','size57','size58','size59','size60','size61','size62','size63','size64','size65','size66','size67','size68','size69','size70','size71','size72','size73','size74','size75','size76','size77','size78','size79','size80','size81','size82','size83','size84','size85','size86','size87','size88','size89','size90','size91','size92','size93','size94','size95','size96','size97','size98','size99','size100','size101','size102','size103','size104','size105','size106','size107','size108','size109','size110','size111','size112','size113','size114','size115','size116','size117','size118','size119','size120','size121','size122','size123','size124','size125','size126','size127','size128','size129','size130','size131','size132','size133','size134','size135','size136','size137','size138','size139','size140','size141','size142','size143','size144','size145','size146','size147','size148','size149','size150','size151','size152','size153','size154','size155','size156','size157','size158','size159','size160','size161','size162','size163','size164','size165','size166','size167','size168','size169','size170','size171','size172','size173','size174','size175','size176','size177','size178','size179','size180','size181','size182','size183','size184','size185','size186','size187','size188','size189','size190','size191','size192','size193','size194','size195','size196','size197','size198','size199','size200','size201','size202','size203','size204','size205','size206','size207','size208','size209','size210','size211','size212','size213','size214','size215','size216','size217','size218','size219','size220','size221','size222','size223','size224','size225','size226','size227','size228','size229','size230','size231','size232','size233','size234','size235','size236','size237','size238','size239','size240','size241','size242','size243','size244','size245','size246','size247','size248','size249','size250','size251','size252','size253','size254','size255','size256') DEFAULT NULL, KEY `size` (`size`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci INSERT INTO items VALUES ("t-shart for child", "size1"); INSERT INTO items VALUES ("leadies' coat", "size1"); INSERT INTO items VALUES ("parka", "size256"); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/column_groonga_vector_reference.result b/storage/mroonga/mysql-test/mroonga/storage/r/column_groonga_vector_reference.result index 1825ee5bbed..1eceec2b45f 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/column_groonga_vector_reference.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/column_groonga_vector_reference.result @@ -14,7 +14,7 @@ bugs CREATE TABLE `bugs` ( `id` int(10) unsigned NOT NULL, `tags` varchar(128) DEFAULT '' COMMENT 'flags "COLUMN_VECTOR", type "tags"', PRIMARY KEY (`id`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci INSERT INTO bugs (id, tags) VALUES (1, "Linux MySQL groonga"); SELECT * FROM bugs; id tags diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/column_set_16_with_index.result b/storage/mroonga/mysql-test/mroonga/storage/r/column_set_16_with_index.result index eb55e9cc5f3..55a12a2d2fd 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/column_set_16_with_index.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/column_set_16_with_index.result @@ -25,7 +25,7 @@ items CREATE TABLE `items` ( `name` varchar(255) DEFAULT NULL, `colors` set('black','dim gray','dark gray','gray','light gray','gainsboro','white smoke','white','red','orange red','dark orange','orange','gold','yellow','chartreuse','lawn green') DEFAULT NULL, KEY `colors` (`colors`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci INSERT INTO items VALUES ("t-shart", "black,gray"); INSERT INTO items VALUES ("hat", "white,dark gray"); INSERT INTO items VALUES ("parka", "chartreuse,orange"); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/column_set_24_with_index.result b/storage/mroonga/mysql-test/mroonga/storage/r/column_set_24_with_index.result index 4d14ac51ccd..c485acfebb6 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/column_set_24_with_index.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/column_set_24_with_index.result @@ -33,7 +33,7 @@ items CREATE TABLE `items` ( `name` varchar(255) DEFAULT NULL, `colors` set('black','dim gray','dark gray','gray','light gray','gainsboro','white smoke','white','red','orange red','dark orange','orange','gold','yellow','chartreuse','lawn green','green','spring green','medium spring green','cyan','deep sky blue','blue','medium blue','dark violet') DEFAULT NULL, KEY `colors` (`colors`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci INSERT INTO items VALUES ("t-shart", "black,white"); INSERT INTO items VALUES ("hat", "white,lawn green"); INSERT INTO items VALUES ("parka", "gray,medium blue"); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/column_set_32_with_index.result b/storage/mroonga/mysql-test/mroonga/storage/r/column_set_32_with_index.result index 3e698b47459..7ff86090382 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/column_set_32_with_index.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/column_set_32_with_index.result @@ -41,7 +41,7 @@ items CREATE TABLE `items` ( `name` varchar(255) DEFAULT NULL, `colors` set('black','dim gray','dark gray','gray','light gray','gainsboro','white smoke','white','red','orange red','dark orange','orange','gold','yellow','chartreuse','lawn green','green','spring green','medium spring green','cyan','deep sky blue','blue','medium blue','dark violet','dark magenta','magenta','dark red','brown','firebrick','indian red','light coral','salmon') DEFAULT NULL, KEY `colors` (`colors`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci INSERT INTO items VALUES ("t-shart", "black,white"); INSERT INTO items VALUES ("hat", "white,dark violet"); INSERT INTO items VALUES ("parka", "green,brown,red"); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/column_set_64_with_index.result b/storage/mroonga/mysql-test/mroonga/storage/r/column_set_64_with_index.result index 0373bbf2d41..393372ae283 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/column_set_64_with_index.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/column_set_64_with_index.result @@ -73,7 +73,7 @@ items CREATE TABLE `items` ( `name` varchar(255) DEFAULT NULL, `colors` set('black','dim gray','dark gray','gray','light gray','gainsboro','white smoke','white','red','orange red','dark orange','orange','gold','yellow','chartreuse','lawn green','green','spring green','medium spring green','cyan','deep sky blue','blue','medium blue','dark violet','dark magenta','magenta','dark red','brown','firebrick','indian red','light coral','salmon','light salmon','tomato','coral','dark salmon','rosy brown','sienna','saddle brown','chocolate','peru','sandy brown','burlywood','tan','navajo white','wheat','dark goldenrod','goldenrod','light goldenrod','pale goldenrod','cornsilk','dark khaki','khaki','lemon chiffon','dark olive green','olive drab','yellow green','green yellow','light green','forest green','dark green','lime green','pale green','dark sea green') DEFAULT NULL, KEY `colors` (`colors`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci INSERT INTO items VALUES ("t-shart", "black,white,lawn green,dark violet"); INSERT INTO items VALUES ("hat", "white,dark violet,yellow green"); INSERT INTO items VALUES ("parka", "green,brown,red,lime green"); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/column_set_8_with_index.result b/storage/mroonga/mysql-test/mroonga/storage/r/column_set_8_with_index.result index 89488f1f21b..cf7aaffdb12 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/column_set_8_with_index.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/column_set_8_with_index.result @@ -17,7 +17,7 @@ items CREATE TABLE `items` ( `name` varchar(255) DEFAULT NULL, `colors` set('black','dim gray','dark gray','gray','light gray','gainsboro','white smoke','white') DEFAULT NULL, KEY `colors` (`colors`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci INSERT INTO items VALUES ("t-shart", "black,gray"); INSERT INTO items VALUES ("hat", "dim gray,dark gray"); INSERT INTO items VALUES ("parka", "white smoke,light gray"); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/create_table_column_groonga_type_parameter.result b/storage/mroonga/mysql-test/mroonga/storage/r/create_table_column_groonga_type_parameter.result index 86ffdf47c75..fca13805e7e 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/create_table_column_groonga_type_parameter.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/create_table_column_groonga_type_parameter.result @@ -11,7 +11,7 @@ bugs CREATE TABLE `bugs` ( `id` int(10) unsigned NOT NULL, `tag` varchar(64) DEFAULT NULL `GROONGA_TYPE`='tags', PRIMARY KEY (`id`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci SELECT mroonga_command("dump --dump_plugins no"); mroonga_command("dump --dump_plugins no") table_create bugs TABLE_PAT_KEY UInt32 diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/create_table_comment_normal.result b/storage/mroonga/mysql-test/mroonga/storage/r/create_table_comment_normal.result index 3241c8a1e75..b9bcb1c997e 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/create_table_comment_normal.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/create_table_comment_normal.result @@ -7,5 +7,5 @@ SHOW CREATE TABLE bugs; Table Create Table bugs CREATE TABLE `bugs` ( `id` int(10) unsigned DEFAULT NULL -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COMMENT='Free style normal comment' +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci COMMENT='Free style normal comment' DROP TABLE bugs; diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/create_table_index_flags_parameter.result b/storage/mroonga/mysql-test/mroonga/storage/r/create_table_index_flags_parameter.result index 55b5e4a5170..1d8a6e1a131 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/create_table_index_flags_parameter.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/create_table_index_flags_parameter.result @@ -8,7 +8,7 @@ Table Create Table memos CREATE TABLE `memos` ( `content` varchar(64) NOT NULL, FULLTEXT KEY `content` (`content`) `FLAGS`='WITH_POSITION|WITH_WEIGHT' -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci SELECT mroonga_command("dump --dump_plugins no --dump_schema no"); mroonga_command("dump --dump_plugins no --dump_schema no") column_create memos#content index COLUMN_INDEX|WITH_WEIGHT|WITH_POSITION memos content diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/create_table_index_normalizer_parameter.result b/storage/mroonga/mysql-test/mroonga/storage/r/create_table_index_normalizer_parameter.result index cf46b8104a9..2fac27a0d31 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/create_table_index_normalizer_parameter.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/create_table_index_normalizer_parameter.result @@ -12,7 +12,7 @@ memos CREATE TABLE `memos` ( `content` text NOT NULL, PRIMARY KEY (`id`), FULLTEXT KEY `content` (`content`) `NORMALIZER`='NormalizerAuto' -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci INSERT INTO memos VALUES (1, "1日の消費㌍は約2000㌔㌍"); SELECT * FROM memos WHERE MATCH (content) AGAINST ("+カロリー" IN BOOLEAN MODE); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/delete_normal_column.result b/storage/mroonga/mysql-test/mroonga/storage/r/delete_normal_column.result index 7503c0b801e..34048cbe6fd 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/delete_normal_column.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/delete_normal_column.result @@ -5,7 +5,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) DEFAULT NULL, `c2` int(11) DEFAULT NULL -) ENGINE=Mroonga DEFAULT CHARSET=latin1 +) ENGINE=Mroonga DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci insert into t1 values (1, 100); insert into t1 values (2, 101); insert into t1 values (3, 102); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/foreign_key_alter_add.result b/storage/mroonga/mysql-test/mroonga/storage/r/foreign_key_alter_add.result index e2e712af4b6..470d2211e51 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/foreign_key_alter_add.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/foreign_key_alter_add.result @@ -16,7 +16,7 @@ articles CREATE TABLE `articles` ( `comment` int(10) unsigned DEFAULT NULL, KEY `comment` (`comment`), CONSTRAINT `comment` FOREIGN KEY (`comment`) REFERENCES `test`.`comments` (`comment`) ON DELETE RESTRICT ON UPDATE RESTRICT -) ENGINE=Mroonga DEFAULT CHARSET=latin1 +) ENGINE=Mroonga DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT * FROM information_schema.referential_constraints; CONSTRAINT_CATALOG CONSTRAINT_SCHEMA CONSTRAINT_NAME UNIQUE_CONSTRAINT_CATALOG UNIQUE_CONSTRAINT_SCHEMA UNIQUE_CONSTRAINT_NAME MATCH_OPTION UPDATE_RULE DELETE_RULE TABLE_NAME REFERENCED_TABLE_NAME def test comment def test PRIMARY NONE RESTRICT RESTRICT articles comments diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/foreign_key_alter_drop.result b/storage/mroonga/mysql-test/mroonga/storage/r/foreign_key_alter_drop.result index fc3cda00499..e5e11c99abb 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/foreign_key_alter_drop.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/foreign_key_alter_drop.result @@ -16,7 +16,7 @@ articles CREATE TABLE `articles` ( `content` text NOT NULL, `comment` int(10) unsigned DEFAULT NULL, KEY `comment` (`comment`) -) ENGINE=Mroonga DEFAULT CHARSET=latin1 +) ENGINE=Mroonga DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT * FROM information_schema.referential_constraints; CONSTRAINT_CATALOG CONSTRAINT_SCHEMA CONSTRAINT_NAME UNIQUE_CONSTRAINT_CATALOG UNIQUE_CONSTRAINT_SCHEMA UNIQUE_CONSTRAINT_NAME MATCH_OPTION UPDATE_RULE DELETE_RULE TABLE_NAME REFERENCED_TABLE_NAME DROP TABLE articles; diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/foreign_key_rename.result b/storage/mroonga/mysql-test/mroonga/storage/r/foreign_key_rename.result index 5ea0ae3e3ac..798be88c682 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/foreign_key_rename.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/foreign_key_rename.result @@ -20,7 +20,7 @@ articles2 CREATE TABLE `articles2` ( `comment` int(10) unsigned DEFAULT NULL, KEY `comment` (`comment`), CONSTRAINT `comment` FOREIGN KEY (`comment`) REFERENCES `test`.`comments2` (`comment`) ON DELETE RESTRICT ON UPDATE RESTRICT -) ENGINE=Mroonga DEFAULT CHARSET=latin1 +) ENGINE=Mroonga DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT * FROM information_schema.referential_constraints; CONSTRAINT_CATALOG CONSTRAINT_SCHEMA CONSTRAINT_NAME UNIQUE_CONSTRAINT_CATALOG UNIQUE_CONSTRAINT_SCHEMA UNIQUE_CONSTRAINT_NAME MATCH_OPTION UPDATE_RULE DELETE_RULE TABLE_NAME REFERENCED_TABLE_NAME def test comment def test PRIMARY NONE RESTRICT RESTRICT articles2 comments2 diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/i_s.result b/storage/mroonga/mysql-test/mroonga/storage/r/i_s.result index 268fde0e2d4..c122b9527ac 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/i_s.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/i_s.result @@ -4,4 +4,4 @@ Mroonga_stats CREATE TEMPORARY TABLE `Mroonga_stats` ( `VERSION` varchar(40) NOT NULL, `rows_written` int(11) NOT NULL, `rows_read` int(11) NOT NULL -) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 +) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/index_btree_normal_column_insert.result b/storage/mroonga/mysql-test/mroonga/storage/r/index_btree_normal_column_insert.result index 043d1e3c1bc..72ba73360be 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/index_btree_normal_column_insert.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/index_btree_normal_column_insert.result @@ -7,7 +7,7 @@ t1 CREATE TABLE `t1` ( `c2` int(11) DEFAULT NULL, PRIMARY KEY (`c1`), KEY `c2` (`c2`) USING BTREE -) ENGINE=Mroonga DEFAULT CHARSET=latin1 +) ENGINE=Mroonga DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci insert into t1 values (1, 100); insert into t1 values (2, 101); insert into t1 values (3, 102); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/index_hash_normal_column_insert.result b/storage/mroonga/mysql-test/mroonga/storage/r/index_hash_normal_column_insert.result index 6e642ce1272..a9c3dbfec57 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/index_hash_normal_column_insert.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/index_hash_normal_column_insert.result @@ -7,7 +7,7 @@ t1 CREATE TABLE `t1` ( `c2` int(11) DEFAULT NULL, PRIMARY KEY (`c1`), KEY `c2` (`c2`) USING HASH -) ENGINE=Mroonga DEFAULT CHARSET=latin1 +) ENGINE=Mroonga DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci insert into t1 values (1, 100); insert into t1 values (2, 101); insert into t1 values (3, 102); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_delete.result b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_delete.result index 7cbce836792..ec18eb22e44 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_delete.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_delete.result @@ -14,7 +14,7 @@ scores CREATE TABLE `scores` ( `score` int(11) NOT NULL, PRIMARY KEY (`id`), KEY `property` (`name`,`score`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci insert into scores (name, score) values("Taro Yamada", 29); insert into scores (name, score) values("Taro Yamada", -12); insert into scores (name, score) values("Jiro Yamada", 27); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_nullable_smallint.result b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_nullable_smallint.result index 71ffa81a577..fec0aa47de5 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_nullable_smallint.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_nullable_smallint.result @@ -13,7 +13,7 @@ t1 CREATE TABLE `t1` ( `c2` smallint(6) DEFAULT NULL, PRIMARY KEY (`id`), KEY `idx1` (`c1`,`c2`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci INSERT INTO t1 (c1, c2) VALUES (1999, 12), (2000, 11), diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_nullable_unsigned_bigint.result b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_nullable_unsigned_bigint.result index 131931cf2e2..4a16031b5d1 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_nullable_unsigned_bigint.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_nullable_unsigned_bigint.result @@ -13,7 +13,7 @@ t1 CREATE TABLE `t1` ( `c2` bigint(20) unsigned DEFAULT NULL, PRIMARY KEY (`id`), KEY `idx1` (`c1`,`c2`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci INSERT INTO t1 (c1, c2) VALUES (1999, 12), (2000, 11), diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_nullable_unsigned_int.result b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_nullable_unsigned_int.result index ffc6af47b1d..a3ede5e7a3b 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_nullable_unsigned_int.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_nullable_unsigned_int.result @@ -13,7 +13,7 @@ t1 CREATE TABLE `t1` ( `c2` int(10) unsigned DEFAULT NULL, PRIMARY KEY (`id`), KEY `idx1` (`c1`,`c2`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci INSERT INTO t1 (c1, c2) VALUES (1999, 12), (2000, 11), diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_nullable_unsigned_smallint.result b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_nullable_unsigned_smallint.result index abc1c26a30b..aa752b5cdd0 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_nullable_unsigned_smallint.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_nullable_unsigned_smallint.result @@ -13,7 +13,7 @@ t1 CREATE TABLE `t1` ( `c2` smallint(5) unsigned DEFAULT NULL, PRIMARY KEY (`id`), KEY `idx1` (`c1`,`c2`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci INSERT INTO t1 (c1, c2) VALUES (1999, 12), (2000, 11), diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_nullable_varchar.result b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_nullable_varchar.result index b1e83decba8..8fb207bcdff 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_nullable_varchar.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_nullable_varchar.result @@ -13,7 +13,7 @@ t1 CREATE TABLE `t1` ( `c2` varchar(10) DEFAULT NULL, PRIMARY KEY (`id`), KEY `idx1` (`c1`,`c2`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci INSERT INTO t1 (c1, c2) VALUES ('1999', '12'), ('2000', '11'), diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_order_by_where_equal_asc_asc.result b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_order_by_where_equal_asc_asc.result index bedd5c69477..81e11c3d1e2 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_order_by_where_equal_asc_asc.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_order_by_where_equal_asc_asc.result @@ -15,7 +15,7 @@ items CREATE TABLE `items` ( `score3` int(11) DEFAULT NULL, PRIMARY KEY (`id`), KEY `score1` (`score1`,`score2`,`score3`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci INSERT INTO items (score1, score2, score3) VALUES(1, 10, -100); INSERT INTO items (score1, score2, score3) VALUES(1, 10, 0); INSERT INTO items (score1, score2, score3) VALUES(2, 10, 100); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_order_by_where_equal_desc_desc.result b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_order_by_where_equal_desc_desc.result index a84b11fbe30..be5285fc9ea 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_order_by_where_equal_desc_desc.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_order_by_where_equal_desc_desc.result @@ -15,7 +15,7 @@ items CREATE TABLE `items` ( `score3` int(11) DEFAULT NULL, PRIMARY KEY (`id`), KEY `score1` (`score1`,`score2`,`score3`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci INSERT INTO items (score1, score2, score3) VALUES(1, 10, -100); INSERT INTO items (score1, score2, score3) VALUES(1, 10, 0); INSERT INTO items (score1, score2, score3) VALUES(2, 10, 100); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_primary_delete.result b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_primary_delete.result index 4fc5d57cf46..bbc5e94d4ab 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_primary_delete.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_primary_delete.result @@ -11,7 +11,7 @@ scores CREATE TABLE `scores` ( `name` char(30) NOT NULL, `score` int(11) NOT NULL, PRIMARY KEY (`name`,`score`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci insert into scores (name, score) values("Taro Yamada", 29); insert into scores (name, score) values("Taro Yamada", -12); insert into scores (name, score) values("Jiro Yamada", 27); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_primary_select_int.result b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_primary_select_int.result index d4e90e1084d..7f51a04d9c5 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_primary_select_int.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_primary_select_int.result @@ -11,7 +11,7 @@ scores CREATE TABLE `scores` ( `name` char(30) NOT NULL, `score` int(11) NOT NULL, PRIMARY KEY (`name`,`score`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci insert into scores (name, score) values("Taro Yamada", 29); insert into scores (name, score) values("Taro Yamada", -12); insert into scores (name, score) values("Jiro Yamada", 27); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_all_used_greater_than.result b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_all_used_greater_than.result index 8492aa2e1bd..b44ba312fec 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_all_used_greater_than.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_all_used_greater_than.result @@ -13,7 +13,7 @@ items CREATE TABLE `items` ( `created_at` datetime DEFAULT NULL, PRIMARY KEY (`id`), KEY `score` (`score`,`created_at`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci INSERT INTO items (score, created_at) VALUES(1, "2014-09-10 00:00:00"); INSERT INTO items (score, created_at) VALUES(2, "2014-09-11 00:00:00"); INSERT INTO items (score, created_at) VALUES(2, "2014-09-11 00:00:00"); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_all_used_greater_than_or_equal.result b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_all_used_greater_than_or_equal.result index 59a3f098d48..e02a82cffc1 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_all_used_greater_than_or_equal.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_all_used_greater_than_or_equal.result @@ -13,7 +13,7 @@ items CREATE TABLE `items` ( `created_at` datetime DEFAULT NULL, PRIMARY KEY (`id`), KEY `score` (`score`,`created_at`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci INSERT INTO items (score, created_at) VALUES(1, "2014-09-10 00:00:00"); INSERT INTO items (score, created_at) VALUES(2, "2014-09-11 00:00:00"); INSERT INTO items (score, created_at) VALUES(2, "2014-09-11 00:00:00"); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_all_used_less_than.result b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_all_used_less_than.result index 46acc21e68d..ae746e722bc 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_all_used_less_than.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_all_used_less_than.result @@ -13,7 +13,7 @@ items CREATE TABLE `items` ( `created_at` datetime DEFAULT NULL, PRIMARY KEY (`id`), KEY `score` (`score`,`created_at`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci INSERT INTO items (score, created_at) VALUES(1, "2014-09-10 00:00:00"); INSERT INTO items (score, created_at) VALUES(2, "2014-09-11 00:00:00"); INSERT INTO items (score, created_at) VALUES(2, "2014-09-11 00:00:00"); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_all_used_less_than_or_equal.result b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_all_used_less_than_or_equal.result index 34dce3eedbf..db0cca7bfd3 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_all_used_less_than_or_equal.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_all_used_less_than_or_equal.result @@ -13,7 +13,7 @@ items CREATE TABLE `items` ( `created_at` datetime DEFAULT NULL, PRIMARY KEY (`id`), KEY `score` (`score`,`created_at`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci INSERT INTO items (score, created_at) VALUES(1, "2014-09-10 00:00:00"); INSERT INTO items (score, created_at) VALUES(2, "2014-09-11 00:00:00"); INSERT INTO items (score, created_at) VALUES(2, "2014-09-11 00:00:00"); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_partially_used_have_prefix_greater_than.result b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_partially_used_have_prefix_greater_than.result index c3dc0139b97..41628e65ff7 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_partially_used_have_prefix_greater_than.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_partially_used_have_prefix_greater_than.result @@ -15,7 +15,7 @@ items CREATE TABLE `items` ( `created_at` datetime DEFAULT NULL, PRIMARY KEY (`id`), KEY `score1` (`score1`,`created_at`,`score2`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci INSERT INTO items (score1, score2, created_at) VALUES(1, 0, "2015-07-01 00:00:00"); INSERT INTO items (score1, score2, created_at) VALUES(2, 0, "2015-07-01 00:00:00"); INSERT INTO items (score1, score2, created_at) VALUES(3, 0, "2015-07-01 00:00:00"); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_partially_used_have_prefix_greater_than_or_equal.result b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_partially_used_have_prefix_greater_than_or_equal.result index 090fba70a04..56919b64b3d 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_partially_used_have_prefix_greater_than_or_equal.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_partially_used_have_prefix_greater_than_or_equal.result @@ -15,7 +15,7 @@ items CREATE TABLE `items` ( `created_at` datetime DEFAULT NULL, PRIMARY KEY (`id`), KEY `score1` (`score1`,`created_at`,`score2`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci INSERT INTO items (score1, score2, created_at) VALUES(1, 0, "2015-07-01 00:00:00"); INSERT INTO items (score1, score2, created_at) VALUES(2, 0, "2015-07-01 00:00:00"); INSERT INTO items (score1, score2, created_at) VALUES(3, 0, "2015-07-01 00:00:00"); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_partially_used_have_prefix_less_than.result b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_partially_used_have_prefix_less_than.result index 146397e699d..072200b0f38 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_partially_used_have_prefix_less_than.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_partially_used_have_prefix_less_than.result @@ -15,7 +15,7 @@ items CREATE TABLE `items` ( `created_at` datetime DEFAULT NULL, PRIMARY KEY (`id`), KEY `score1` (`score1`,`created_at`,`score2`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci INSERT INTO items (score1, score2, created_at) VALUES(1, 0, "2015-07-01 00:00:00"); INSERT INTO items (score1, score2, created_at) VALUES(2, 0, "2015-07-01 00:00:00"); INSERT INTO items (score1, score2, created_at) VALUES(3, 0, "2015-07-01 00:00:00"); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_partially_used_have_prefix_less_than_or_equal.result b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_partially_used_have_prefix_less_than_or_equal.result index 806c48a3a42..74c6aa46730 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_partially_used_have_prefix_less_than_or_equal.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_partially_used_have_prefix_less_than_or_equal.result @@ -15,7 +15,7 @@ items CREATE TABLE `items` ( `created_at` datetime DEFAULT NULL, PRIMARY KEY (`id`), KEY `score1` (`score1`,`created_at`,`score2`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci INSERT INTO items (score1, score2, created_at) VALUES(1, 0, "2015-07-01 00:00:00"); INSERT INTO items (score1, score2, created_at) VALUES(2, 0, "2015-07-01 00:00:00"); INSERT INTO items (score1, score2, created_at) VALUES(3, 0, "2015-07-01 00:00:00"); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_partially_used_no_prefix_greater_than.result b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_partially_used_no_prefix_greater_than.result index 876c0f3095a..aca6e54a6e6 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_partially_used_no_prefix_greater_than.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_partially_used_no_prefix_greater_than.result @@ -15,7 +15,7 @@ items CREATE TABLE `items` ( `created_at` datetime DEFAULT NULL, PRIMARY KEY (`id`), KEY `created_at` (`created_at`,`score1`,`score2`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci INSERT INTO items (score1, score2, created_at) VALUES(1, 0, "2015-07-01 00:00:00"); INSERT INTO items (score1, score2, created_at) VALUES(2, 0, "2015-07-01 00:00:00"); INSERT INTO items (score1, score2, created_at) VALUES(2, 0, "2015-07-01 12:00:00"); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_partially_used_no_prefix_greater_than_or_equal.result b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_partially_used_no_prefix_greater_than_or_equal.result index d9e5f3920f5..dd8b8f9125b 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_partially_used_no_prefix_greater_than_or_equal.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_partially_used_no_prefix_greater_than_or_equal.result @@ -15,7 +15,7 @@ items CREATE TABLE `items` ( `created_at` datetime DEFAULT NULL, PRIMARY KEY (`id`), KEY `created_at` (`created_at`,`score1`,`score2`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci INSERT INTO items (score1, score2, created_at) VALUES(1, 0, "2015-07-01 00:00:00"); INSERT INTO items (score1, score2, created_at) VALUES(2, 0, "2015-07-01 00:00:00"); INSERT INTO items (score1, score2, created_at) VALUES(2, 0, "2015-07-01 12:00:00"); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_partially_used_no_prefix_less_than.result b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_partially_used_no_prefix_less_than.result index d9d1b2aecc6..77fd2ce8511 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_partially_used_no_prefix_less_than.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_partially_used_no_prefix_less_than.result @@ -15,7 +15,7 @@ items CREATE TABLE `items` ( `created_at` datetime DEFAULT NULL, PRIMARY KEY (`id`), KEY `created_at` (`created_at`,`score1`,`score2`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci INSERT INTO items (score1, score2, created_at) VALUES(1, 0, "2015-07-01 00:00:00"); INSERT INTO items (score1, score2, created_at) VALUES(2, 0, "2015-07-01 00:00:00"); INSERT INTO items (score1, score2, created_at) VALUES(2, 0, "2015-07-01 12:00:00"); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_partially_used_no_prefix_less_than_or_equal.result b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_partially_used_no_prefix_less_than_or_equal.result index 7b3c59ad493..68daea5d5f5 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_partially_used_no_prefix_less_than_or_equal.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_range_partially_used_no_prefix_less_than_or_equal.result @@ -15,7 +15,7 @@ items CREATE TABLE `items` ( `created_at` datetime DEFAULT NULL, PRIMARY KEY (`id`), KEY `created_at` (`created_at`,`score1`,`score2`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci INSERT INTO items (score1, score2, created_at) VALUES(1, 0, "2015-07-01 00:00:00"); INSERT INTO items (score1, score2, created_at) VALUES(2, 0, "2015-07-01 00:00:00"); INSERT INTO items (score1, score2, created_at) VALUES(2, 0, "2015-07-01 12:00:00"); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_recreate.result b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_recreate.result index 6813cb79cc8..53c9e8e87fa 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_recreate.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_recreate.result @@ -14,7 +14,7 @@ listing CREATE TABLE `listing` ( `first_name` char(30) NOT NULL, PRIMARY KEY (`id`), KEY `name` (`last_name`,`first_name`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci insert into listing (last_name, first_name) values("Taro", "Yamada"); insert into listing (last_name, first_name) values("Taro", "Suzuki"); insert into listing (last_name, first_name) values("Jiro", "Yamada"); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_replace.result b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_replace.result index 863084e18b9..aa236967647 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_replace.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_replace.result @@ -13,7 +13,7 @@ scores CREATE TABLE `scores` ( `score` int(11) NOT NULL, PRIMARY KEY (`id`), KEY `property` (`name`,`score`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci INSERT INTO scores (name, score) VALUES("Taro Yamada", 29); INSERT INTO scores (name, score) VALUES("Taro Yamada", -12); INSERT INTO scores (name, score) VALUES("Jiro Yamada", 27); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_select_int.result b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_select_int.result index 3b42e98d54c..adaf523be02 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_select_int.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_select_int.result @@ -13,7 +13,7 @@ scores CREATE TABLE `scores` ( `score` int(11) NOT NULL, PRIMARY KEY (`id`), KEY `property` (`score`,`name`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci INSERT INTO scores (name, score) VALUES("Taro Yamada", 29); INSERT INTO scores (name, score) VALUES("Taro Yamada", -12); INSERT INTO scores (name, score) VALUES("Jiro Yamada", 27); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_select_string.result b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_select_string.result index cf17a5e648c..62b857bbb27 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_select_string.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_select_string.result @@ -14,7 +14,7 @@ listing CREATE TABLE `listing` ( `first_name` char(30) NOT NULL, PRIMARY KEY (`id`), KEY `name` (`last_name`,`first_name`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci insert into listing (last_name, first_name) values("Taro", "Yamada"); insert into listing (last_name, first_name) values("Taro", "Suzuki"); insert into listing (last_name, first_name) values("Jiro", "Yamada"); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_select_varchar.result b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_select_varchar.result index 6d80aa0cacd..36b769ea515 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_select_varchar.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_select_varchar.result @@ -15,7 +15,7 @@ scores CREATE TABLE `scores` ( `family_name` varchar(30) NOT NULL, `score` int(11) NOT NULL, PRIMARY KEY (`given_name`,`family_name`,`score`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci insert into scores values("Taro", "Yamada", 29); insert into scores values("Taro", "Yamada", -12); insert into scores values("Jiro", "Yamada", 27); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_update_int.result b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_update_int.result index 04725691884..91fef7bea42 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_update_int.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_update_int.result @@ -13,7 +13,7 @@ scores CREATE TABLE `scores` ( `score` int(11) NOT NULL, PRIMARY KEY (`id`), KEY `property` (`score`,`name`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci INSERT INTO scores (name, score) VALUES("Taro Yamada", 29); INSERT INTO scores (name, score) VALUES("Taro Yamada", -12); INSERT INTO scores (name, score) VALUES("Jiro Yamada", 29); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_update_string.result b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_update_string.result index a12b71301ef..5dfcd916808 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_update_string.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/index_multiple_column_update_string.result @@ -14,7 +14,7 @@ scores CREATE TABLE `scores` ( `score` int(11) NOT NULL, PRIMARY KEY (`id`), KEY `property` (`name`,`score`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci insert into scores (name, score) values("Taro Yamada", 29); insert into scores (name, score) values("Taro Yamada", -12); insert into scores (name, score) values("Jiro Yamada", 27); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/show_create_table_TODO_SPLIT_ME.result b/storage/mroonga/mysql-test/mroonga/storage/r/show_create_table_TODO_SPLIT_ME.result index ef87703e716..dd26cfaf5b8 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/show_create_table_TODO_SPLIT_ME.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/show_create_table_TODO_SPLIT_ME.result @@ -4,7 +4,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) DEFAULT NULL -) ENGINE=Mroonga DEFAULT CHARSET=latin1 +) ENGINE=Mroonga DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table t1; create table t1 (c1 int, c2 int); show create table t1; @@ -12,7 +12,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) DEFAULT NULL, `c2` int(11) DEFAULT NULL -) ENGINE=Mroonga DEFAULT CHARSET=latin1 +) ENGINE=Mroonga DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table t1; create table t1 (c1 int primary key, c2 varchar(100)); show create table t1; @@ -21,5 +21,5 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` varchar(100) DEFAULT NULL, PRIMARY KEY (`c1`) -) ENGINE=Mroonga DEFAULT CHARSET=latin1 +) ENGINE=Mroonga DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table t1; diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/update_int.result b/storage/mroonga/mysql-test/mroonga/storage/r/update_int.result index e022fa237bb..606c30a9979 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/update_int.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/update_int.result @@ -5,7 +5,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) DEFAULT NULL, `c2` int(11) DEFAULT NULL -) ENGINE=Mroonga DEFAULT CHARSET=latin1 +) ENGINE=Mroonga DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci insert into t1 values (1, 100); insert into t1 values (2, 101); insert into t1 values (3, 102); diff --git a/storage/mroonga/mysql-test/mroonga/wrapper/r/alter_table_change_column_comment.result b/storage/mroonga/mysql-test/mroonga/wrapper/r/alter_table_change_column_comment.result index f1532a14c21..a56ae08dd9f 100644 --- a/storage/mroonga/mysql-test/mroonga/wrapper/r/alter_table_change_column_comment.result +++ b/storage/mroonga/mysql-test/mroonga/wrapper/r/alter_table_change_column_comment.result @@ -13,5 +13,5 @@ bugs CREATE TABLE `bugs` ( `id` int(10) unsigned NOT NULL, `tag` varchar(64) DEFAULT NULL COMMENT 'It must consist of only alphabet and number.', PRIMARY KEY (`id`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COMMENT='engine "InnoDB"' +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci COMMENT='engine "InnoDB"' DROP TABLE bugs; diff --git a/storage/mroonga/mysql-test/mroonga/wrapper/r/column_comment_index_not_for_mroonga.result b/storage/mroonga/mysql-test/mroonga/wrapper/r/column_comment_index_not_for_mroonga.result index b1f20f7bacc..708055b6464 100644 --- a/storage/mroonga/mysql-test/mroonga/wrapper/r/column_comment_index_not_for_mroonga.result +++ b/storage/mroonga/mysql-test/mroonga/wrapper/r/column_comment_index_not_for_mroonga.result @@ -12,5 +12,5 @@ bugs CREATE TABLE `bugs` ( `tag` varchar(64) DEFAULT NULL, PRIMARY KEY (`id`), KEY `tag` (`tag`) COMMENT 'Tag search is required.' -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COMMENT='engine "InnoDB"' +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci COMMENT='engine "InnoDB"' DROP TABLE bugs; diff --git a/storage/mroonga/mysql-test/mroonga/wrapper/r/column_normal_comment.result b/storage/mroonga/mysql-test/mroonga/wrapper/r/column_normal_comment.result index 3f7a445c6e2..9c4b974ca40 100644 --- a/storage/mroonga/mysql-test/mroonga/wrapper/r/column_normal_comment.result +++ b/storage/mroonga/mysql-test/mroonga/wrapper/r/column_normal_comment.result @@ -9,5 +9,5 @@ bugs CREATE TABLE `bugs` ( `id` int(10) unsigned NOT NULL, `tag` varchar(64) DEFAULT NULL COMMENT 'It must consist of only alphabet and number.', PRIMARY KEY (`id`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COMMENT='engine "InnoDB"' +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci COMMENT='engine "InnoDB"' DROP TABLE bugs; diff --git a/storage/mroonga/mysql-test/mroonga/wrapper/r/create_table_flags_parameter.result b/storage/mroonga/mysql-test/mroonga/wrapper/r/create_table_flags_parameter.result index 57c674855da..39bf778cac9 100644 --- a/storage/mroonga/mysql-test/mroonga/wrapper/r/create_table_flags_parameter.result +++ b/storage/mroonga/mysql-test/mroonga/wrapper/r/create_table_flags_parameter.result @@ -9,7 +9,7 @@ memos CREATE TABLE `memos` ( `content` varchar(64) NOT NULL, PRIMARY KEY (`content`), FULLTEXT KEY `content` (`content`) `FLAGS`='WITH_POSITION|WITH_WEIGHT' -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COMMENT='ENGINE "InnoDB"' +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci COMMENT='ENGINE "InnoDB"' SELECT mroonga_command("dump --dump_plugins no --dump_schema no"); mroonga_command("dump --dump_plugins no --dump_schema no") column_create memos#content index COLUMN_INDEX|WITH_WEIGHT|WITH_POSITION memos diff --git a/storage/mroonga/mysql-test/mroonga/wrapper/r/create_table_normalizer_comment.result b/storage/mroonga/mysql-test/mroonga/wrapper/r/create_table_normalizer_comment.result index 1bb9c584e00..97f900a19b8 100644 --- a/storage/mroonga/mysql-test/mroonga/wrapper/r/create_table_normalizer_comment.result +++ b/storage/mroonga/mysql-test/mroonga/wrapper/r/create_table_normalizer_comment.result @@ -12,7 +12,7 @@ memos CREATE TABLE `memos` ( `content` text NOT NULL, PRIMARY KEY (`id`), FULLTEXT KEY `content` (`content`) COMMENT 'normalizer "NormalizerAuto"' -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COMMENT='ENGINE "InnoDB"' +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci COMMENT='ENGINE "InnoDB"' INSERT INTO memos VALUES (1, "1日の消費㌍は約2000㌔㌍"); SELECT * FROM memos WHERE MATCH (content) AGAINST ("+カロリー" IN BOOLEAN MODE); diff --git a/storage/mroonga/mysql-test/mroonga/wrapper/r/create_table_normalizer_fulltext_index_bin.result b/storage/mroonga/mysql-test/mroonga/wrapper/r/create_table_normalizer_fulltext_index_bin.result index db8ad8a5de2..97f3e886946 100644 --- a/storage/mroonga/mysql-test/mroonga/wrapper/r/create_table_normalizer_fulltext_index_bin.result +++ b/storage/mroonga/mysql-test/mroonga/wrapper/r/create_table_normalizer_fulltext_index_bin.result @@ -9,7 +9,7 @@ SHOW CREATE TABLE memos; Table Create Table memos CREATE TABLE `memos` ( `id` int(11) NOT NULL, - `content` text COLLATE utf8mb3_bin NOT NULL, + `content` text NOT NULL, PRIMARY KEY (`id`), FULLTEXT KEY `content` (`content`) COMMENT 'normalizer "NormalizerAuto"' ) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin COMMENT='ENGINE "InnoDB"' diff --git a/storage/mroonga/mysql-test/mroonga/wrapper/r/create_table_normalizer_parameter.result b/storage/mroonga/mysql-test/mroonga/wrapper/r/create_table_normalizer_parameter.result index 742b2195359..b81407b6f59 100644 --- a/storage/mroonga/mysql-test/mroonga/wrapper/r/create_table_normalizer_parameter.result +++ b/storage/mroonga/mysql-test/mroonga/wrapper/r/create_table_normalizer_parameter.result @@ -12,7 +12,7 @@ memos CREATE TABLE `memos` ( `content` text NOT NULL, PRIMARY KEY (`id`), FULLTEXT KEY `content` (`content`) `NORMALIZER`='NormalizerAuto' -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COMMENT='ENGINE "InnoDB"' +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci COMMENT='ENGINE "InnoDB"' INSERT INTO memos VALUES (1, "1日の消費㌍は約2000㌔㌍"); SELECT * FROM memos WHERE MATCH (content) AGAINST ("+カロリー" IN BOOLEAN MODE); diff --git a/storage/mroonga/mysql-test/mroonga/wrapper/r/delete_TODO_SPLIT_ME.result b/storage/mroonga/mysql-test/mroonga/wrapper/r/delete_TODO_SPLIT_ME.result index 990537622f4..81926396759 100644 --- a/storage/mroonga/mysql-test/mroonga/wrapper/r/delete_TODO_SPLIT_ME.result +++ b/storage/mroonga/mysql-test/mroonga/wrapper/r/delete_TODO_SPLIT_ME.result @@ -6,7 +6,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` int(11) DEFAULT NULL, PRIMARY KEY (`c1`) -) ENGINE=Mroonga DEFAULT CHARSET=latin1 COMMENT='engine = "innodb"' +) ENGINE=Mroonga DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='engine = "innodb"' insert into t1 values (1, 100); insert into t1 values (2, 101); insert into t1 values (3, 102); diff --git a/storage/mroonga/mysql-test/mroonga/wrapper/r/insert_on_duplicate_key_update_multiple_column_primary_key_myisam.result b/storage/mroonga/mysql-test/mroonga/wrapper/r/insert_on_duplicate_key_update_multiple_column_primary_key_myisam.result index d34a3827230..198eca2a4db 100644 --- a/storage/mroonga/mysql-test/mroonga/wrapper/r/insert_on_duplicate_key_update_multiple_column_primary_key_myisam.result +++ b/storage/mroonga/mysql-test/mroonga/wrapper/r/insert_on_duplicate_key_update_multiple_column_primary_key_myisam.result @@ -12,7 +12,7 @@ diaries CREATE TABLE `diaries` ( `title` varchar(100) NOT NULL, `content` text NOT NULL, PRIMARY KEY (`date`,`title`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COMMENT='ENGINE "MyISAM"' +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci COMMENT='ENGINE "MyISAM"' INSERT INTO diaries (date, title, content) VALUES ("2012-03-04", "cloudy day", "Today is cloudy day..."); INSERT INTO diaries (date, title, content) diff --git a/storage/mroonga/mysql-test/mroonga/wrapper/r/insert_on_duplicate_key_update_multiple_column_unique_index_myisam.result b/storage/mroonga/mysql-test/mroonga/wrapper/r/insert_on_duplicate_key_update_multiple_column_unique_index_myisam.result index ab1cc56cdc5..05a9320667f 100644 --- a/storage/mroonga/mysql-test/mroonga/wrapper/r/insert_on_duplicate_key_update_multiple_column_unique_index_myisam.result +++ b/storage/mroonga/mysql-test/mroonga/wrapper/r/insert_on_duplicate_key_update_multiple_column_unique_index_myisam.result @@ -15,7 +15,7 @@ diaries CREATE TABLE `diaries` ( `content` text NOT NULL, PRIMARY KEY (`id`), UNIQUE KEY `date` (`date`,`title`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COMMENT='ENGINE "MyISAM"' +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci COMMENT='ENGINE "MyISAM"' INSERT INTO diaries (date, title, content) VALUES ("2012-03-04", "cloudy day", "Today is cloudy day..."); INSERT INTO diaries (date, title, content) diff --git a/storage/mroonga/mysql-test/mroonga/wrapper/r/performance_schema.result b/storage/mroonga/mysql-test/mroonga/wrapper/r/performance_schema.result index f6325146635..b06cd8af972 100644 --- a/storage/mroonga/mysql-test/mroonga/wrapper/r/performance_schema.result +++ b/storage/mroonga/mysql-test/mroonga/wrapper/r/performance_schema.result @@ -14,7 +14,7 @@ diaries CREATE TABLE `diaries` ( `content` varchar(255) DEFAULT NULL, PRIMARY KEY (`id`), FULLTEXT KEY `content` (`content`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COMMENT='ENGINE "InnoDB"' +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci COMMENT='ENGINE "InnoDB"' INSERT INTO diaries (content) VALUES ("Tommorow will be shiny day!"); SHOW TABLES FROM performance_schema LIKE 'threads'; Tables_in_performance_schema (threads) diff --git a/storage/mroonga/mysql-test/mroonga/wrapper/r/transaction_query_cache.result b/storage/mroonga/mysql-test/mroonga/wrapper/r/transaction_query_cache.result index e8f5f509457..b08d1c0c52d 100644 --- a/storage/mroonga/mysql-test/mroonga/wrapper/r/transaction_query_cache.result +++ b/storage/mroonga/mysql-test/mroonga/wrapper/r/transaction_query_cache.result @@ -9,7 +9,7 @@ Table Create Table simple_table CREATE TABLE `simple_table` ( `id` int(11) NOT NULL, PRIMARY KEY (`id`) -) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COMMENT='ENGINE "InnoDB"' +) ENGINE=Mroonga DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci COMMENT='ENGINE "InnoDB"' INSERT INTO simple_table (id) VALUES (1),(2); USE test; START TRANSACTION; diff --git a/storage/mroonga/mysql-test/mroonga/wrapper/r/update_int.result b/storage/mroonga/mysql-test/mroonga/wrapper/r/update_int.result index 5506f6b10b0..311debbbf79 100644 --- a/storage/mroonga/mysql-test/mroonga/wrapper/r/update_int.result +++ b/storage/mroonga/mysql-test/mroonga/wrapper/r/update_int.result @@ -6,7 +6,7 @@ t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` int(11) DEFAULT NULL, PRIMARY KEY (`c1`) -) ENGINE=Mroonga DEFAULT CHARSET=latin1 COMMENT='engine "innodb"' +) ENGINE=Mroonga DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='engine "innodb"' insert into t1 values (1, 100); insert into t1 values (2, 101); insert into t1 values (3, 102); diff --git a/storage/myisam/mi_test3.c b/storage/myisam/mi_test3.c index 30cf95c47a4..74684edd5bc 100644 --- a/storage/myisam/mi_test3.c +++ b/storage/myisam/mi_test3.c @@ -401,7 +401,7 @@ int test_write(MI_INFO *file,int id,int lock_type) int test_update(MI_INFO *file,int id,int lock_type) { - uint i,lock,found,next,prev,update; + uint i,lock,update; uint32 tmp; char find[4]; struct record new_record; @@ -424,24 +424,20 @@ int test_update(MI_INFO *file,int id,int lock_type) bzero((char*) &new_record,sizeof(new_record)); strmov((char*) new_record.text,"Updated"); - found=next=prev=update=0; + update=0; for (i=0 ; i < 100 ; i++) { tmp=rnd(100000); int4store(find,tmp); - if (!mi_rkey(file,record.id,1,(uchar*) find, HA_WHOLE_KEY, - HA_READ_KEY_EXACT)) - found++; - else + if (mi_rkey(file,record.id,1,(uchar*) find, HA_WHOLE_KEY, + HA_READ_KEY_EXACT)) { if (my_errno != HA_ERR_KEY_NOT_FOUND) { fprintf(stderr,"%2d: Got error %d from read in update\n",id,my_errno); return 1; } - else if (!mi_rnext(file,record.id,1)) - next++; - else + else if (mi_rnext(file,record.id,1)) { if (my_errno != HA_ERR_END_OF_FILE) { @@ -449,9 +445,7 @@ int test_update(MI_INFO *file,int id,int lock_type) id,my_errno); return 1; } - else if (!mi_rprev(file,record.id,1)) - prev++; - else + else if (mi_rprev(file,record.id,1)) { if (my_errno != HA_ERR_END_OF_FILE) { diff --git a/storage/rocksdb/mysql-test/rocksdb/r/1st.result b/storage/rocksdb/mysql-test/rocksdb/r/1st.result index 323b614ea36..9ae4b069bc3 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/1st.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/1st.result @@ -7,7 +7,7 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` char(8) DEFAULT NULL, PRIMARY KEY (`pk`) -) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 +) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SHOW COLUMNS IN t1; Field Type Null Key Default Extra pk int(11) NO PRI 0 diff --git a/storage/rocksdb/mysql-test/rocksdb/r/add_index_inplace_crash.result b/storage/rocksdb/mysql-test/rocksdb/r/add_index_inplace_crash.result index 439383b04f4..00a4e35417f 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/add_index_inplace_crash.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/add_index_inplace_crash.result @@ -16,7 +16,7 @@ t1 CREATE TABLE `t1` ( `b` int(11) DEFAULT NULL, KEY `ka` (`a`), KEY `kab` (`a`,`b`) -) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 +) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci CHECK TABLE t1; Table Op Msg_type Msg_text test.t1 check status OK @@ -36,7 +36,7 @@ t1 CREATE TABLE `t1` ( `k` int(11) DEFAULT NULL, PRIMARY KEY (`i`), KEY `j` (`j`) -) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 +) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PARTITION BY KEY (`i`) PARTITIONS 4 ALTER TABLE t1 ADD INDEX kij(i,j), ALGORITHM=INPLACE; @@ -71,7 +71,7 @@ t1 CREATE TABLE `t1` ( `k` int(11) DEFAULT NULL, PRIMARY KEY (`i`), KEY `j` (`j`) -) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 +) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PARTITION BY KEY (`i`) PARTITIONS 4 ALTER TABLE t1 ADD INDEX kij(i,j), ALGORITHM=INPLACE; @@ -84,7 +84,7 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`i`), KEY `j` (`j`), KEY `kij` (`i`,`j`) -) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 +) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PARTITION BY KEY (`i`) PARTITIONS 4 SELECT COUNT(*) FROM t1; diff --git a/storage/rocksdb/mysql-test/rocksdb/r/add_unique_index_inplace.result b/storage/rocksdb/mysql-test/rocksdb/r/add_unique_index_inplace.result index e998cfb43c1..3bf3536e477 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/add_unique_index_inplace.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/add_unique_index_inplace.result @@ -14,7 +14,7 @@ t1 CREATE TABLE `t1` ( `a` int(11) NOT NULL, `b` int(11) DEFAULT NULL, PRIMARY KEY (`a`) -) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 +) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a INT, b INT, PRIMARY KEY ka(a)) ENGINE=RocksDB; Warnings: @@ -33,7 +33,7 @@ t1 CREATE TABLE `t1` ( `b` int(11) DEFAULT NULL, PRIMARY KEY (`a`), UNIQUE KEY `kb` (`b`) -) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 +) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT * FROM t1 FORCE INDEX(kb); a b 1 5 @@ -56,7 +56,7 @@ t1 CREATE TABLE `t1` ( `b` int(11) DEFAULT NULL, PRIMARY KEY (`a`), UNIQUE KEY `kb` (`b`) -) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 +) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT COUNT(*) FROM t1 FORCE INDEX(kb); COUNT(*) 4 @@ -77,7 +77,7 @@ t1 CREATE TABLE `t1` ( `c` int(11) DEFAULT NULL, PRIMARY KEY (`a`), UNIQUE KEY `kbc` (`b`,`c`) -) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 +) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT COUNT(*) FROM t1 FORCE INDEX(kbc); COUNT(*) 4 @@ -96,7 +96,7 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` int(11) DEFAULT NULL, UNIQUE KEY `kb` (`b`) -) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 +) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 ( a INT PRIMARY KEY, diff --git a/storage/rocksdb/mysql-test/rocksdb/r/allow_no_primary_key.result b/storage/rocksdb/mysql-test/rocksdb/r/allow_no_primary_key.result index 96d25b2e669..9a98daf8f60 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/allow_no_primary_key.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/allow_no_primary_key.result @@ -5,7 +5,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` char(8) DEFAULT NULL -) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 +) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SHOW COLUMNS IN t1; Field Type Null Key Default Extra a int(11) YES NULL @@ -91,7 +91,7 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `c` char(8) DEFAULT NULL, `b` int(11) DEFAULT NULL -) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 +) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT * FROM t1; a c b 1 a NULL @@ -102,7 +102,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `c` char(8) DEFAULT NULL -) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 +) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT * FROM t1; a c 1 a @@ -115,7 +115,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` char(8) DEFAULT NULL -) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 +) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SHOW COLUMNS IN t1; Field Type Null Key Default Extra a int(11) YES NULL @@ -251,7 +251,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` char(8) DEFAULT NULL -) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 +) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SHOW COLUMNS IN t1; Field Type Null Key Default Extra a int(11) YES NULL diff --git a/storage/rocksdb/mysql-test/rocksdb/r/allow_no_primary_key_with_sk.result b/storage/rocksdb/mysql-test/rocksdb/r/allow_no_primary_key_with_sk.result index 27722b23927..9e66db2472f 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/allow_no_primary_key_with_sk.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/allow_no_primary_key_with_sk.result @@ -6,7 +6,7 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` char(8) DEFAULT NULL, KEY `a` (`a`) -) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 +) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SHOW COLUMNS IN t1; Field Type Null Key Default Extra a int(11) YES MUL NULL @@ -91,7 +91,7 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` char(8) DEFAULT NULL, KEY `b` (`b`) -) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 +) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SHOW COLUMNS IN t1; Field Type Null Key Default Extra a int(11) YES NULL @@ -173,7 +173,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` char(8) DEFAULT NULL -) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 +) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SHOW COLUMNS IN t1; Field Type Null Key Default Extra a int(11) YES NULL @@ -257,7 +257,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` char(8) DEFAULT NULL -) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 +) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SHOW COLUMNS IN t1; Field Type Null Key Default Extra a int(11) YES NULL @@ -348,7 +348,7 @@ t1 CREATE TABLE `t1` ( `b` char(8) DEFAULT NULL, KEY `a` (`a`), KEY `b` (`b`) -) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 +) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SHOW COLUMNS IN t1; Field Type Null Key Default Extra a int(11) YES MUL NULL @@ -432,7 +432,7 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` char(8) DEFAULT NULL, KEY `a` (`a`,`b`) -) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 +) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SHOW COLUMNS IN t1; Field Type Null Key Default Extra a int(11) YES MUL NULL @@ -517,7 +517,7 @@ t1 CREATE TABLE `t1` ( `b` char(8) DEFAULT NULL, KEY `a` (`a`), KEY `b` (`b`) -) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 +) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SHOW COLUMNS IN t1; Field Type Null Key Default Extra a int(11) YES MUL NULL @@ -635,7 +635,7 @@ t1 CREATE TABLE `t1` ( KEY `kab` (`a`,`b`), KEY `kbc` (`b`,`c`), KEY `kabc` (`a`,`b`,`c`) -) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 +) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SHOW COLUMNS IN t1; Field Type Null Key Default Extra a int(11) YES MUL NULL @@ -697,7 +697,7 @@ t1 CREATE TABLE `t1` ( KEY `ka` (`a`) COMMENT 'rev:cf1', KEY `kb` (`b`) COMMENT 'rev:cf1', KEY `kab` (`a`,`b`) COMMENT 'rev:cf2' -) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 +) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SHOW COLUMNS IN t1; Field Type Null Key Default Extra a int(11) YES MUL NULL @@ -795,12 +795,12 @@ Table Create Table t1 CREATE TABLE `t1` ( `i` int(11) NOT NULL AUTO_INCREMENT, KEY `i` (`i`) -) ENGINE=ROCKSDB AUTO_INCREMENT=4 DEFAULT CHARSET=latin1 +) ENGINE=ROCKSDB AUTO_INCREMENT=4 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci # restart show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `i` int(11) NOT NULL AUTO_INCREMENT, KEY `i` (`i`) -) ENGINE=ROCKSDB AUTO_INCREMENT=4 DEFAULT CHARSET=latin1 +) ENGINE=ROCKSDB AUTO_INCREMENT=4 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table t1; diff --git a/storage/rocksdb/mysql-test/rocksdb/r/alter_table.result b/storage/rocksdb/mysql-test/rocksdb/r/alter_table.result index c82338f79ac..4ba9834a279 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/alter_table.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/alter_table.result @@ -10,7 +10,7 @@ t1 CREATE TABLE `t1` ( `c` char(8) DEFAULT NULL, `b` int(11) DEFAULT NULL, PRIMARY KEY (`pk`) -) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 +) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ALTER COLUMN a SET DEFAULT '0'; SHOW CREATE TABLE t1; Table Create Table @@ -20,7 +20,7 @@ t1 CREATE TABLE `t1` ( `c` char(8) DEFAULT NULL, `b` int(11) DEFAULT NULL, PRIMARY KEY (`pk`) -) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 +) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ALTER a DROP DEFAULT; SHOW CREATE TABLE t1; Table Create Table @@ -30,7 +30,7 @@ t1 CREATE TABLE `t1` ( `c` char(8) DEFAULT NULL, `b` int(11) DEFAULT NULL, PRIMARY KEY (`pk`) -) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 +) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 CHANGE COLUMN b b1 CHAR(8) FIRST; SHOW CREATE TABLE t1; Table Create Table @@ -40,7 +40,7 @@ t1 CREATE TABLE `t1` ( `a` int(11), `c` char(8) DEFAULT NULL, PRIMARY KEY (`pk`) -) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 +) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 CHANGE b1 b INT AFTER c; SHOW CREATE TABLE t1; Table Create Table @@ -50,7 +50,7 @@ t1 CREATE TABLE `t1` ( `c` char(8) DEFAULT NULL, `b` int(11) DEFAULT NULL, PRIMARY KEY (`pk`) -) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 +) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 CHANGE b b CHAR(8); SHOW CREATE TABLE t1; Table Create Table @@ -60,7 +60,7 @@ t1 CREATE TABLE `t1` ( `c` char(8) DEFAULT NULL, `b` char(8) DEFAULT NULL, PRIMARY KEY (`pk`) -) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 +) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 MODIFY COLUMN b INT; SHOW CREATE TABLE t1; Table Create Table @@ -70,7 +70,7 @@ t1 CREATE TABLE `t1` ( `c` char(8) DEFAULT NULL, `b` int(11) DEFAULT NULL, PRIMARY KEY (`pk`) -) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 +) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 MODIFY COLUMN b CHAR(8) FIRST; SHOW CREATE TABLE t1; Table Create Table @@ -80,7 +80,7 @@ t1 CREATE TABLE `t1` ( `a` int(11), `c` char(8) DEFAULT NULL, PRIMARY KEY (`pk`) -) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 +) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 MODIFY COLUMN b INT AFTER a; SHOW CREATE TABLE t1; Table Create Table @@ -90,7 +90,7 @@ t1 CREATE TABLE `t1` ( `b` int(11) DEFAULT NULL, `c` char(8) DEFAULT NULL, PRIMARY KEY (`pk`) -) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 +) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 DROP COLUMN b; SHOW CREATE TABLE t1; Table Create Table @@ -99,7 +99,7 @@ t1 CREATE TABLE `t1` ( `a` int(11), `c` char(8) DEFAULT NULL, PRIMARY KEY (`pk`) -) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 +) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 RENAME TO t2; SHOW CREATE TABLE t1; ERROR 42S02: Table 'test.t1' doesn't exist @@ -110,7 +110,7 @@ t2 CREATE TABLE `t2` ( `a` int(11), `c` char(8) DEFAULT NULL, PRIMARY KEY (`pk`) -) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 +) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t2; CREATE TABLE t1 (pk INT PRIMARY KEY, a INT, b INT) ENGINE=rocksdb; INSERT INTO t1 VALUES (1,1,5),(2,2,2),(3,4,3); @@ -121,7 +121,7 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` int(11) DEFAULT NULL, PRIMARY KEY (`pk`) -) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 +) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 ORDER BY b ASC, a DESC, pk DESC; Warnings: Warning 1105 ORDER BY ignored as there is a user-defined clustered index in the table 't1' @@ -132,7 +132,7 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` int(11) DEFAULT NULL, PRIMARY KEY (`pk`) -) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 +) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT * FROM t1; pk a b 1 1 5 @@ -146,8 +146,8 @@ Table Create Table t1 CREATE TABLE `t1` ( `pk` int(11) NOT NULL, `a` int(11) DEFAULT NULL, - `b` char(8) COLLATE latin1_general_cs DEFAULT NULL, - `c` char(8) COLLATE latin1_general_cs DEFAULT NULL, + `b` char(8) DEFAULT NULL, + `c` char(8) DEFAULT NULL, PRIMARY KEY (`pk`) ) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_general_cs ALTER TABLE t1 CONVERT TO CHARACTER SET utf8; @@ -159,15 +159,15 @@ t1 CREATE TABLE `t1` ( `b` char(8) DEFAULT NULL, `c` char(8) DEFAULT NULL, PRIMARY KEY (`pk`) -) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb3 +) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci ALTER TABLE t1 DEFAULT CHARACTER SET = latin1 COLLATE latin1_general_ci; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `pk` int(11) NOT NULL, `a` int(11) DEFAULT NULL, - `b` char(8) CHARACTER SET utf8mb3 DEFAULT NULL, - `c` char(8) CHARACTER SET utf8mb3 DEFAULT NULL, + `b` char(8) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL, + `c` char(8) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL, PRIMARY KEY (`pk`) ) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci ALTER TABLE t1 FORCE; @@ -176,8 +176,8 @@ Table Create Table t1 CREATE TABLE `t1` ( `pk` int(11) NOT NULL, `a` int(11) DEFAULT NULL, - `b` char(8) CHARACTER SET utf8mb3 DEFAULT NULL, - `c` char(8) CHARACTER SET utf8mb3 DEFAULT NULL, + `b` char(8) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL, + `c` char(8) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL, PRIMARY KEY (`pk`) ) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci DROP TABLE t1; diff --git a/storage/rocksdb/mysql-test/rocksdb/r/autoinc_vars.result b/storage/rocksdb/mysql-test/rocksdb/r/autoinc_vars.result index cc47ceff7ca..ef173234d70 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/autoinc_vars.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/autoinc_vars.result @@ -74,7 +74,7 @@ t1 CREATE TABLE `t1` ( `a` bigint(20) unsigned NOT NULL AUTO_INCREMENT, `b` char(8) DEFAULT NULL, PRIMARY KEY (`a`) -) ENGINE=ROCKSDB AUTO_INCREMENT=18446744073709551614 DEFAULT CHARSET=latin1 +) ENGINE=ROCKSDB AUTO_INCREMENT=18446744073709551614 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci INSERT INTO t1 VALUES (NULL, 'b'); SHOW CREATE TABLE t1; Table Create Table @@ -82,7 +82,7 @@ t1 CREATE TABLE `t1` ( `a` bigint(20) unsigned NOT NULL AUTO_INCREMENT, `b` char(8) DEFAULT NULL, PRIMARY KEY (`a`) -) ENGINE=ROCKSDB AUTO_INCREMENT=18446744073709551615 DEFAULT CHARSET=latin1 +) ENGINE=ROCKSDB AUTO_INCREMENT=18446744073709551615 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci INSERT INTO t1 VALUES (NULL, 'c'); ERROR HY000: Failed to read auto-increment value from storage engine SELECT * FROM t1; @@ -99,7 +99,7 @@ t1 CREATE TABLE `t1` ( `a` bigint(20) unsigned NOT NULL AUTO_INCREMENT, `b` char(8) DEFAULT NULL, PRIMARY KEY (`a`) -) ENGINE=ROCKSDB AUTO_INCREMENT=18446744073709551614 DEFAULT CHARSET=latin1 +) ENGINE=ROCKSDB AUTO_INCREMENT=18446744073709551614 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci INSERT INTO t1 VALUES (NULL, 'b'); ERROR HY000: Failed to read auto-increment value from storage engine SHOW CREATE TABLE t1; @@ -108,7 +108,7 @@ t1 CREATE TABLE `t1` ( `a` bigint(20) unsigned NOT NULL AUTO_INCREMENT, `b` char(8) DEFAULT NULL, PRIMARY KEY (`a`) -) ENGINE=ROCKSDB AUTO_INCREMENT=18446744073709551615 DEFAULT CHARSET=latin1 +) ENGINE=ROCKSDB AUTO_INCREMENT=18446744073709551615 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci INSERT INTO t1 VALUES (NULL, 'c'); ERROR HY000: Failed to read auto-increment value from storage engine SELECT * FROM t1; @@ -124,7 +124,7 @@ t1 CREATE TABLE `t1` ( `a` bigint(20) unsigned NOT NULL AUTO_INCREMENT, `b` char(8) DEFAULT NULL, PRIMARY KEY (`a`) -) ENGINE=ROCKSDB AUTO_INCREMENT=18446744073709551614 DEFAULT CHARSET=latin1 +) ENGINE=ROCKSDB AUTO_INCREMENT=18446744073709551614 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci INSERT INTO t1 VALUES (NULL, 'b'); ERROR HY000: Failed to read auto-increment value from storage engine SHOW CREATE TABLE t1; @@ -133,7 +133,7 @@ t1 CREATE TABLE `t1` ( `a` bigint(20) unsigned NOT NULL AUTO_INCREMENT, `b` char(8) DEFAULT NULL, PRIMARY KEY (`a`) -) ENGINE=ROCKSDB AUTO_INCREMENT=18446744073709551615 DEFAULT CHARSET=latin1 +) ENGINE=ROCKSDB AUTO_INCREMENT=18446744073709551615 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci INSERT INTO t1 VALUES (NULL, 'c'); ERROR HY000: Failed to read auto-increment value from storage engine SELECT * FROM t1; diff --git a/storage/rocksdb/mysql-test/rocksdb/r/concurrent_alter.result b/storage/rocksdb/mysql-test/rocksdb/r/concurrent_alter.result index b8c73b2418e..e5d7643eac4 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/concurrent_alter.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/concurrent_alter.result @@ -8,5 +8,5 @@ Table Create Table a1 CREATE TABLE `a1` ( `a` int(11) DEFAULT NULL, `b` int(11) DEFAULT NULL -) ENGINE=ROCKSDB DEFAULT CHARSET=DEFAULT_CHARSET +) ENGINE=ROCKSDB DEFAULT CHARSET=DEFAULT_CHARSET COLLATE=DEFAULT_CHARSET_swedish_ci DROP DATABASE mysqlslap; diff --git a/storage/rocksdb/mysql-test/rocksdb/r/create_table.result b/storage/rocksdb/mysql-test/rocksdb/r/create_table.result index 8c879d82611..fe81f26b901 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/create_table.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/create_table.result @@ -5,7 +5,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) NOT NULL, PRIMARY KEY (`a`) -) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 +) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci CREATE TABLE IF NOT EXISTS t1 (a INT PRIMARY KEY) ENGINE=rocksdb; Warnings: Note 1050 Table 't1' already exists @@ -15,7 +15,7 @@ Table Create Table t2 CREATE TABLE `t2` ( `a` int(11) NOT NULL, PRIMARY KEY (`a`) -) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 +) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci CREATE TEMPORARY TABLE t2 (a INT PRIMARY KEY) ENGINE=rocksdb; ERROR HY000: Table storage engine 'ROCKSDB' does not support the create option 'TEMPORARY' DROP TABLE t2; @@ -27,7 +27,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) NOT NULL, PRIMARY KEY (`a`) -) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 +) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a INT PRIMARY KEY) AS SELECT 1 AS a UNION SELECT 2 AS a; SHOW CREATE TABLE t1; @@ -35,7 +35,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) NOT NULL, PRIMARY KEY (`a`) -) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 +) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT * FROM t1; a 1 diff --git a/storage/rocksdb/mysql-test/rocksdb/r/drop_index_inplace.result b/storage/rocksdb/mysql-test/rocksdb/r/drop_index_inplace.result index 0c66b405196..83bb0f6dc9c 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/drop_index_inplace.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/drop_index_inplace.result @@ -8,7 +8,7 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`b`), KEY `ka` (`a`), KEY `kb` (`a`,`b`) -) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 +) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci INSERT INTO t1 (a) VALUES (1); INSERT INTO t1 (a) VALUES (3); INSERT INTO t1 (a) VALUES (5); @@ -20,7 +20,7 @@ t1 CREATE TABLE `t1` ( `b` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`b`), KEY `kb` (`a`,`b`) -) ENGINE=ROCKSDB AUTO_INCREMENT=4 DEFAULT CHARSET=latin1 +) ENGINE=ROCKSDB AUTO_INCREMENT=4 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT * FROM t1 FORCE INDEX(ka) where a > 1; ERROR 42000: Key 'ka' doesn't exist in table 't1' SELECT * FROM t1 FORCE INDEX(kb) where a > 1; @@ -43,7 +43,7 @@ t1 CREATE TABLE `t1` ( KEY `kb` (`b`), KEY `kbc` (`b`,`c`), KEY `kc` (`c`) -) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 +) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci INSERT INTO t1 (b,c) VALUES (1,2); INSERT INTO t1 (b,c) VALUES (3,4); INSERT INTO t1 (b,c) VALUES (5,6); @@ -56,7 +56,7 @@ t1 CREATE TABLE `t1` ( `c` int(11) DEFAULT NULL, PRIMARY KEY (`a`), KEY `kc` (`c`) -) ENGINE=ROCKSDB AUTO_INCREMENT=4 DEFAULT CHARSET=latin1 +) ENGINE=ROCKSDB AUTO_INCREMENT=4 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci # restart SHOW CREATE TABLE t1; Table Create Table @@ -66,7 +66,7 @@ t1 CREATE TABLE `t1` ( `c` int(11) DEFAULT NULL, PRIMARY KEY (`a`), KEY `kc` (`c`) -) ENGINE=ROCKSDB AUTO_INCREMENT=4 DEFAULT CHARSET=latin1 +) ENGINE=ROCKSDB AUTO_INCREMENT=4 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci INSERT INTO t1 (b,c) VALUES (1,2); INSERT INTO t1 (b,c) VALUES (3,4); INSERT INTO t1 (b,c) VALUES (5,6); @@ -134,7 +134,7 @@ t1 CREATE TABLE `t1` ( `b` int(11) DEFAULT NULL, `c` int(11) DEFAULT NULL, PRIMARY KEY (`a`) -) ENGINE=ROCKSDB AUTO_INCREMENT=4 DEFAULT CHARSET=latin1 +) ENGINE=ROCKSDB AUTO_INCREMENT=4 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE IF NOT EXISTS t1 (col1 INT, col2 INT, col3 INT); INSERT INTO t1 (col1,col2,col3) VALUES (1,2,3); diff --git a/storage/rocksdb/mysql-test/rocksdb/r/i_s.result b/storage/rocksdb/mysql-test/rocksdb/r/i_s.result index a45e6c636cc..a3f57610bfa 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/i_s.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/i_s.result @@ -22,14 +22,14 @@ ROCKSDB_CF_OPTIONS CREATE TEMPORARY TABLE `ROCKSDB_CF_OPTIONS` ( `CF_NAME` varchar(193) NOT NULL, `OPTION_TYPE` varchar(193) NOT NULL, `VALUE` varchar(193) NOT NULL -) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 +) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci SHOW CREATE TABLE INFORMATION_SCHEMA.ROCKSDB_CFSTATS; Table Create Table ROCKSDB_CFSTATS CREATE TEMPORARY TABLE `ROCKSDB_CFSTATS` ( `CF_NAME` varchar(193) NOT NULL, `STAT_TYPE` varchar(193) NOT NULL, `VALUE` bigint(21) NOT NULL -) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 +) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci SHOW CREATE TABLE INFORMATION_SCHEMA.ROCKSDB_COMPACTION_STATS; Table Create Table ROCKSDB_COMPACTION_STATS CREATE TEMPORARY TABLE `ROCKSDB_COMPACTION_STATS` ( @@ -37,13 +37,13 @@ ROCKSDB_COMPACTION_STATS CREATE TEMPORARY TABLE `ROCKSDB_COMPACTION_STATS` ( `LEVEL` varchar(513) NOT NULL, `TYPE` varchar(513) NOT NULL, `VALUE` double NOT NULL -) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 +) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci SHOW CREATE TABLE INFORMATION_SCHEMA.ROCKSDB_DBSTATS; Table Create Table ROCKSDB_DBSTATS CREATE TEMPORARY TABLE `ROCKSDB_DBSTATS` ( `STAT_TYPE` varchar(193) NOT NULL, `VALUE` bigint(21) NOT NULL -) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 +) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci SHOW CREATE TABLE INFORMATION_SCHEMA.ROCKSDB_DDL; Table Create Table ROCKSDB_DDL CREATE TEMPORARY TABLE `ROCKSDB_DDL` ( @@ -59,7 +59,7 @@ ROCKSDB_DDL CREATE TEMPORARY TABLE `ROCKSDB_DDL` ( `INDEX_FLAGS` bigint(21) NOT NULL, `CF` varchar(193) NOT NULL, `AUTO_INCREMENT` bigint(21) unsigned -) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 +) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci SHOW CREATE TABLE INFORMATION_SCHEMA.ROCKSDB_DEADLOCK; Table Create Table ROCKSDB_DEADLOCK CREATE TEMPORARY TABLE `ROCKSDB_DEADLOCK` ( @@ -72,14 +72,14 @@ ROCKSDB_DEADLOCK CREATE TEMPORARY TABLE `ROCKSDB_DEADLOCK` ( `INDEX_NAME` varchar(193) NOT NULL, `TABLE_NAME` varchar(193) NOT NULL, `ROLLED_BACK` bigint(21) NOT NULL -) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 +) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci SHOW CREATE TABLE INFORMATION_SCHEMA.ROCKSDB_GLOBAL_INFO; Table Create Table ROCKSDB_GLOBAL_INFO CREATE TEMPORARY TABLE `ROCKSDB_GLOBAL_INFO` ( `TYPE` varchar(513) NOT NULL, `NAME` varchar(513) NOT NULL, `VALUE` varchar(513) NOT NULL -) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 +) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci SHOW CREATE TABLE INFORMATION_SCHEMA.ROCKSDB_INDEX_FILE_MAP; Table Create Table ROCKSDB_INDEX_FILE_MAP CREATE TEMPORARY TABLE `ROCKSDB_INDEX_FILE_MAP` ( @@ -93,7 +93,7 @@ ROCKSDB_INDEX_FILE_MAP CREATE TEMPORARY TABLE `ROCKSDB_INDEX_FILE_MAP` ( `ENTRY_MERGES` bigint(21) NOT NULL, `ENTRY_OTHERS` bigint(21) NOT NULL, `DISTINCT_KEYS_PREFIX` varchar(800) NOT NULL -) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 +) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci SHOW CREATE TABLE INFORMATION_SCHEMA.ROCKSDB_LOCKS; Table Create Table ROCKSDB_LOCKS CREATE TEMPORARY TABLE `ROCKSDB_LOCKS` ( @@ -101,7 +101,7 @@ ROCKSDB_LOCKS CREATE TEMPORARY TABLE `ROCKSDB_LOCKS` ( `TRANSACTION_ID` int(11) NOT NULL, `KEY` varchar(513) NOT NULL, `MODE` varchar(32) NOT NULL -) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 +) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci SHOW CREATE TABLE INFORMATION_SCHEMA.ROCKSDB_PERF_CONTEXT; Table Create Table ROCKSDB_PERF_CONTEXT CREATE TEMPORARY TABLE `ROCKSDB_PERF_CONTEXT` ( @@ -110,13 +110,13 @@ ROCKSDB_PERF_CONTEXT CREATE TEMPORARY TABLE `ROCKSDB_PERF_CONTEXT` ( `PARTITION_NAME` varchar(193), `STAT_TYPE` varchar(193) NOT NULL, `VALUE` bigint(21) NOT NULL -) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 +) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci SHOW CREATE TABLE INFORMATION_SCHEMA.ROCKSDB_PERF_CONTEXT_GLOBAL; Table Create Table ROCKSDB_PERF_CONTEXT_GLOBAL CREATE TEMPORARY TABLE `ROCKSDB_PERF_CONTEXT_GLOBAL` ( `STAT_TYPE` varchar(193) NOT NULL, `VALUE` bigint(21) NOT NULL -) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 +) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci SHOW CREATE TABLE INFORMATION_SCHEMA.ROCKSDB_SST_PROPS; Table Create Table ROCKSDB_SST_PROPS CREATE TEMPORARY TABLE `ROCKSDB_SST_PROPS` ( @@ -137,7 +137,7 @@ ROCKSDB_SST_PROPS CREATE TEMPORARY TABLE `ROCKSDB_SST_PROPS` ( `OLDEST_KEY_TIME` bigint(21) NOT NULL, `FILTER_POLICY` varchar(193) NOT NULL, `COMPRESSION_OPTIONS` varchar(193) NOT NULL -) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 +) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci SHOW CREATE TABLE INFORMATION_SCHEMA.ROCKSDB_TRX; Table Create Table ROCKSDB_TRX CREATE TEMPORARY TABLE `ROCKSDB_TRX` ( @@ -156,4 +156,4 @@ ROCKSDB_TRX CREATE TEMPORARY TABLE `ROCKSDB_TRX` ( `NUM_ONGOING_BULKLOAD` int(11) NOT NULL, `THREAD_ID` int(11) NOT NULL, `QUERY` varchar(193) NOT NULL -) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 +) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci diff --git a/storage/rocksdb/mysql-test/rocksdb/r/i_s_deadlock.result b/storage/rocksdb/mysql-test/rocksdb/r/i_s_deadlock.result index de6de581cd8..805f5294f2c 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/i_s_deadlock.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/i_s_deadlock.result @@ -22,7 +22,7 @@ ROCKSDB_DEADLOCK CREATE TEMPORARY TABLE `ROCKSDB_DEADLOCK` ( `INDEX_NAME` varchar(193) NOT NULL, `TABLE_NAME` varchar(193) NOT NULL, `ROLLED_BACK` bigint(21) NOT NULL -) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 +) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci create table t (i int primary key) engine=rocksdb; insert into t values (1), (2), (3); select * from information_schema.rocksdb_deadlock; diff --git a/storage/rocksdb/mysql-test/rocksdb/r/rocksdb.result b/storage/rocksdb/mysql-test/rocksdb/r/rocksdb.result index 2dc3d02d4b1..a23283306b0 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/rocksdb.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/rocksdb.result @@ -47,7 +47,7 @@ Table Create Table t0 CREATE TABLE `t0` ( `a` int(11) NOT NULL, PRIMARY KEY (`a`) -) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 +) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table t0; create table t1 (a int primary key, b int) engine=rocksdb; insert into t1 values (1,1); @@ -2484,7 +2484,7 @@ r2 CREATE TABLE `r2` ( `id` int(11) NOT NULL AUTO_INCREMENT, `value` int(11) DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 +) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci begin; insert into r1 values (10, 1); commit; @@ -2508,7 +2508,7 @@ r2 CREATE TABLE `r2` ( `id` int(11) NOT NULL AUTO_INCREMENT, `value` int(11) DEFAULT NULL, KEY `i` (`id`) -) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 +) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci begin; insert into r1 values (10, 1); commit; diff --git a/storage/rocksdb/mysql-test/rocksdb/r/tbl_opt_ai.result b/storage/rocksdb/mysql-test/rocksdb/r/tbl_opt_ai.result index 7cc0cc7cd98..b9ce363f916 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/tbl_opt_ai.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/tbl_opt_ai.result @@ -5,7 +5,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`a`) -) ENGINE=ROCKSDB AUTO_INCREMENT=10 DEFAULT CHARSET=latin1 +) ENGINE=ROCKSDB AUTO_INCREMENT=10 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci INSERT INTO t1 VALUES (NULL); SELECT * FROM t1; a @@ -16,7 +16,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`a`) -) ENGINE=ROCKSDB AUTO_INCREMENT=100 DEFAULT CHARSET=latin1 +) ENGINE=ROCKSDB AUTO_INCREMENT=100 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci INSERT INTO t1 VALUES (NULL); SELECT * FROM t1 ORDER BY a; a @@ -28,7 +28,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`a`) -) ENGINE=ROCKSDB AUTO_INCREMENT=101 DEFAULT CHARSET=latin1 +) ENGINE=ROCKSDB AUTO_INCREMENT=101 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci INSERT INTO t1 VALUES (NULL); SELECT * FROM t1 ORDER BY a; a diff --git a/storage/rocksdb/mysql-test/rocksdb/r/tbl_opt_avg_row_length.result b/storage/rocksdb/mysql-test/rocksdb/r/tbl_opt_avg_row_length.result index f904c04e0fb..f7a114c1e6e 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/tbl_opt_avg_row_length.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/tbl_opt_avg_row_length.result @@ -6,7 +6,7 @@ t1 CREATE TABLE `t1` ( `a` int(11) NOT NULL, `b` char(8) DEFAULT NULL, PRIMARY KEY (`a`) -) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 AVG_ROW_LENGTH=300 +) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci AVG_ROW_LENGTH=300 ALTER TABLE t1 AVG_ROW_LENGTH=30000000; SHOW CREATE TABLE t1; Table Create Table @@ -14,5 +14,5 @@ t1 CREATE TABLE `t1` ( `a` int(11) NOT NULL, `b` char(8) DEFAULT NULL, PRIMARY KEY (`a`) -) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 AVG_ROW_LENGTH=30000000 +) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci AVG_ROW_LENGTH=30000000 DROP TABLE t1; diff --git a/storage/rocksdb/mysql-test/rocksdb/r/tbl_opt_checksum.result b/storage/rocksdb/mysql-test/rocksdb/r/tbl_opt_checksum.result index d9cc69ee2a1..efc65f23fba 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/tbl_opt_checksum.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/tbl_opt_checksum.result @@ -6,7 +6,7 @@ t1 CREATE TABLE `t1` ( `a` int(11) NOT NULL, `b` char(8) DEFAULT NULL, PRIMARY KEY (`a`) -) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 CHECKSUM=1 +) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci CHECKSUM=1 ALTER TABLE t1 CHECKSUM=0; SHOW CREATE TABLE t1; Table Create Table @@ -14,5 +14,5 @@ t1 CREATE TABLE `t1` ( `a` int(11) NOT NULL, `b` char(8) DEFAULT NULL, PRIMARY KEY (`a`) -) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 +) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; diff --git a/storage/rocksdb/mysql-test/rocksdb/r/tbl_opt_connection.result b/storage/rocksdb/mysql-test/rocksdb/r/tbl_opt_connection.result index 0beddd9f6e3..0d1674f629b 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/tbl_opt_connection.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/tbl_opt_connection.result @@ -11,7 +11,7 @@ t1 CREATE TABLE `t1` ( `a` int(11) NOT NULL, `b` char(8) DEFAULT NULL, PRIMARY KEY (`a`) -) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 CONNECTION='test_connection' +) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci CONNECTION='test_connection' ALTER TABLE t1 CONNECTION='test_connection2'; SHOW CREATE TABLE t1; Table Create Table @@ -19,7 +19,7 @@ t1 CREATE TABLE `t1` ( `a` int(11) NOT NULL, `b` char(8) DEFAULT NULL, PRIMARY KEY (`a`) -) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 CONNECTION='test_connection2' +) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci CONNECTION='test_connection2' DROP TABLE t1; DROP SERVER test_connection; DROP SERVER test_connection2; diff --git a/storage/rocksdb/mysql-test/rocksdb/r/tbl_opt_delay_key_write.result b/storage/rocksdb/mysql-test/rocksdb/r/tbl_opt_delay_key_write.result index c5d1ad8ace9..192e7c2bb2a 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/tbl_opt_delay_key_write.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/tbl_opt_delay_key_write.result @@ -6,7 +6,7 @@ t1 CREATE TABLE `t1` ( `a` int(11) NOT NULL, `b` char(8) DEFAULT NULL, PRIMARY KEY (`a`) -) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 DELAY_KEY_WRITE=1 +) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DELAY_KEY_WRITE=1 ALTER TABLE t1 DELAY_KEY_WRITE=0; SHOW CREATE TABLE t1; Table Create Table @@ -14,5 +14,5 @@ t1 CREATE TABLE `t1` ( `a` int(11) NOT NULL, `b` char(8) DEFAULT NULL, PRIMARY KEY (`a`) -) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 +) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; diff --git a/storage/rocksdb/mysql-test/rocksdb/r/tbl_opt_insert_method.result b/storage/rocksdb/mysql-test/rocksdb/r/tbl_opt_insert_method.result index bd5e65f59c4..742ccd623c0 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/tbl_opt_insert_method.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/tbl_opt_insert_method.result @@ -6,7 +6,7 @@ t1 CREATE TABLE `t1` ( `a` int(11) NOT NULL, `b` char(8) DEFAULT NULL, PRIMARY KEY (`a`) -) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 +) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 INSERT_METHOD=NO; SHOW CREATE TABLE t1; Table Create Table @@ -14,5 +14,5 @@ t1 CREATE TABLE `t1` ( `a` int(11) NOT NULL, `b` char(8) DEFAULT NULL, PRIMARY KEY (`a`) -) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 +) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; diff --git a/storage/rocksdb/mysql-test/rocksdb/r/tbl_opt_key_block_size.result b/storage/rocksdb/mysql-test/rocksdb/r/tbl_opt_key_block_size.result index 6c34d08b7eb..448600143ef 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/tbl_opt_key_block_size.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/tbl_opt_key_block_size.result @@ -6,7 +6,7 @@ t1 CREATE TABLE `t1` ( `a` int(11) NOT NULL, `b` char(8) DEFAULT NULL, PRIMARY KEY (`a`) -) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 KEY_BLOCK_SIZE=8 +) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci KEY_BLOCK_SIZE=8 ALTER TABLE t1 KEY_BLOCK_SIZE=1; SHOW CREATE TABLE t1; Table Create Table @@ -14,5 +14,5 @@ t1 CREATE TABLE `t1` ( `a` int(11) NOT NULL, `b` char(8) DEFAULT NULL, PRIMARY KEY (`a`) KEY_BLOCK_SIZE=8 -) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 KEY_BLOCK_SIZE=1 +) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci KEY_BLOCK_SIZE=1 DROP TABLE t1; diff --git a/storage/rocksdb/mysql-test/rocksdb/r/tbl_opt_max_rows.result b/storage/rocksdb/mysql-test/rocksdb/r/tbl_opt_max_rows.result index 679e00e0771..9424d6c00b4 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/tbl_opt_max_rows.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/tbl_opt_max_rows.result @@ -6,7 +6,7 @@ t1 CREATE TABLE `t1` ( `a` int(11) NOT NULL, `b` char(8) DEFAULT NULL, PRIMARY KEY (`a`) -) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 MAX_ROWS=10000000 +) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci MAX_ROWS=10000000 ALTER TABLE t1 MAX_ROWS=30000000; SHOW CREATE TABLE t1; Table Create Table @@ -14,5 +14,5 @@ t1 CREATE TABLE `t1` ( `a` int(11) NOT NULL, `b` char(8) DEFAULT NULL, PRIMARY KEY (`a`) -) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 MAX_ROWS=30000000 +) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci MAX_ROWS=30000000 DROP TABLE t1; diff --git a/storage/rocksdb/mysql-test/rocksdb/r/tbl_opt_min_rows.result b/storage/rocksdb/mysql-test/rocksdb/r/tbl_opt_min_rows.result index bc650434b7a..eaeec241710 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/tbl_opt_min_rows.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/tbl_opt_min_rows.result @@ -6,7 +6,7 @@ t1 CREATE TABLE `t1` ( `a` int(11) NOT NULL, `b` char(8) DEFAULT NULL, PRIMARY KEY (`a`) -) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 MIN_ROWS=1 +) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci MIN_ROWS=1 ALTER TABLE t1 MIN_ROWS=10000; SHOW CREATE TABLE t1; Table Create Table @@ -14,5 +14,5 @@ t1 CREATE TABLE `t1` ( `a` int(11) NOT NULL, `b` char(8) DEFAULT NULL, PRIMARY KEY (`a`) -) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 MIN_ROWS=10000 +) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci MIN_ROWS=10000 DROP TABLE t1; diff --git a/storage/rocksdb/mysql-test/rocksdb/r/tbl_opt_pack_keys.result b/storage/rocksdb/mysql-test/rocksdb/r/tbl_opt_pack_keys.result index b42d3f4d450..b5c8af54391 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/tbl_opt_pack_keys.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/tbl_opt_pack_keys.result @@ -6,7 +6,7 @@ t1 CREATE TABLE `t1` ( `a` int(11) NOT NULL, `b` char(8) DEFAULT NULL, PRIMARY KEY (`a`) -) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 PACK_KEYS=1 +) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PACK_KEYS=1 ALTER TABLE t1 PACK_KEYS=0; SHOW CREATE TABLE t1; Table Create Table @@ -14,5 +14,5 @@ t1 CREATE TABLE `t1` ( `a` int(11) NOT NULL, `b` char(8) DEFAULT NULL, PRIMARY KEY (`a`) -) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 PACK_KEYS=0 +) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PACK_KEYS=0 DROP TABLE t1; diff --git a/storage/rocksdb/mysql-test/rocksdb/r/tbl_opt_password.result b/storage/rocksdb/mysql-test/rocksdb/r/tbl_opt_password.result index 80ec79497ce..1f2354d036d 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/tbl_opt_password.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/tbl_opt_password.result @@ -6,7 +6,7 @@ t1 CREATE TABLE `t1` ( `a` int(11) NOT NULL, `b` char(8) DEFAULT NULL, PRIMARY KEY (`a`) -) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 +) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 PASSWORD='new_password'; SHOW CREATE TABLE t1; Table Create Table @@ -14,5 +14,5 @@ t1 CREATE TABLE `t1` ( `a` int(11) NOT NULL, `b` char(8) DEFAULT NULL, PRIMARY KEY (`a`) -) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 +) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; diff --git a/storage/rocksdb/mysql-test/rocksdb/r/tbl_opt_row_format.result b/storage/rocksdb/mysql-test/rocksdb/r/tbl_opt_row_format.result index a0c480eaede..c30e9ecb359 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/tbl_opt_row_format.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/tbl_opt_row_format.result @@ -6,7 +6,7 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` char(8) NOT NULL, PRIMARY KEY (`b`) -) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 ROW_FORMAT=FIXED +) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ROW_FORMAT=FIXED ALTER TABLE t1 ROW_FORMAT=DYNAMIC; SHOW CREATE TABLE t1; Table Create Table @@ -14,5 +14,5 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` char(8) NOT NULL, PRIMARY KEY (`b`) -) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC +) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ROW_FORMAT=DYNAMIC DROP TABLE t1; diff --git a/storage/rocksdb/mysql-test/rocksdb/r/tbl_opt_union.result b/storage/rocksdb/mysql-test/rocksdb/r/tbl_opt_union.result index fb021dbda18..13062d43374 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/tbl_opt_union.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/tbl_opt_union.result @@ -5,12 +5,12 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) NOT NULL, PRIMARY KEY (`a`) -) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 +) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ALTER TABLE t1 UNION = (child1,child2); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) NOT NULL, PRIMARY KEY (`a`) -) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 +) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1, child1, child2; diff --git a/storage/rocksdb/mysql-test/rocksdb/r/tbl_standard_opts.result b/storage/rocksdb/mysql-test/rocksdb/r/tbl_standard_opts.result index f0018e782fd..5a9041c5f30 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/tbl_standard_opts.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/tbl_standard_opts.result @@ -10,7 +10,7 @@ t1 CREATE TABLE `t1` ( `a` int(11) NOT NULL, `b` char(8) DEFAULT NULL, PRIMARY KEY (`a`) -) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb3 COMMENT='standard table options' +) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci COMMENT='standard table options' ALTER TABLE t1 COMMENT = 'table altered'; SHOW CREATE TABLE t1; Table Create Table @@ -18,7 +18,7 @@ t1 CREATE TABLE `t1` ( `a` int(11) NOT NULL, `b` char(8) DEFAULT NULL, PRIMARY KEY (`a`) -) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb3 COMMENT='table altered' +) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci COMMENT='table altered' ALTER TABLE t1 ENGINE=MEMORY; SHOW CREATE TABLE t1; Table Create Table @@ -26,7 +26,7 @@ t1 CREATE TABLE `t1` ( `a` int(11) NOT NULL, `b` char(8) DEFAULT NULL, PRIMARY KEY (`a`) -) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COMMENT='table altered' +) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci COMMENT='table altered' ALTER TABLE t1 ENGINE=rocksdb; SHOW CREATE TABLE t1; Table Create Table @@ -34,13 +34,13 @@ t1 CREATE TABLE `t1` ( `a` int(11) NOT NULL, `b` char(8) DEFAULT NULL, PRIMARY KEY (`a`) -) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb3 COMMENT='table altered' +) ENGINE=ROCKSDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci COMMENT='table altered' ALTER TABLE t1 CHARACTER SET = latin1 COLLATE = latin1_swedish_ci; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) NOT NULL, - `b` char(8) CHARACTER SET utf8mb3 DEFAULT NULL, + `b` char(8) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL, PRIMARY KEY (`a`) -) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COMMENT='table altered' +) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='table altered' DROP TABLE t1; diff --git a/storage/rocksdb/mysql-test/rocksdb/r/ttl_primary.result b/storage/rocksdb/mysql-test/rocksdb/r/ttl_primary.result index 2903e9aa7eb..97c0e0c952b 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/ttl_primary.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/ttl_primary.result @@ -324,7 +324,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) NOT NULL, PRIMARY KEY (`a`) -) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COMMENT='ttl_duration=1' +) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='ttl_duration=1' set global rocksdb_force_flush_memtable_now=1; set global rocksdb_compact_cf='default'; SELECT COUNT(*) FROM t1; diff --git a/storage/rocksdb/mysql-test/rocksdb/r/ttl_primary_with_partitions.result b/storage/rocksdb/mysql-test/rocksdb/r/ttl_primary_with_partitions.result index d6d9e290e9f..49c42a8601d 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/ttl_primary_with_partitions.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/ttl_primary_with_partitions.result @@ -149,7 +149,7 @@ t1 CREATE TABLE `t1` ( `name` varchar(25) NOT NULL, `event` date DEFAULT NULL, PRIMARY KEY (`c2`,`c1`) COMMENT 'custom_p0_cfname=foo;custom_p1_cfname=bar;custom_p2_cfname=baz;' -) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COMMENT='custom_p0_ttl_duration=9999;custom_p2_ttl_duration=5;' +) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='custom_p0_ttl_duration=9999;custom_p2_ttl_duration=5;' PARTITION BY LIST (`c1`) (PARTITION `custom_p0` VALUES IN (1,2,3) ENGINE = ROCKSDB, PARTITION `custom_p1` VALUES IN (4,5,6) ENGINE = ROCKSDB, diff --git a/storage/rocksdb/mysql-test/rocksdb/r/ttl_secondary.result b/storage/rocksdb/mysql-test/rocksdb/r/ttl_secondary.result index 1f748a3841a..1b47004d1f3 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/ttl_secondary.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/ttl_secondary.result @@ -372,7 +372,7 @@ t1 CREATE TABLE `t1` ( `b` int(11) NOT NULL, PRIMARY KEY (`a`), KEY `kb` (`b`) -) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COMMENT='ttl_duration=1' +) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='ttl_duration=1' set global rocksdb_debug_ttl_ignore_pk=1; set global rocksdb_force_flush_memtable_now=1; set global rocksdb_compact_cf='default'; diff --git a/storage/rocksdb/mysql-test/rocksdb/r/ttl_secondary_with_partitions.result b/storage/rocksdb/mysql-test/rocksdb/r/ttl_secondary_with_partitions.result index 713c7e92fa8..bbe53353d41 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/ttl_secondary_with_partitions.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/ttl_secondary_with_partitions.result @@ -218,7 +218,7 @@ t1 CREATE TABLE `t1` ( `event` date DEFAULT NULL, PRIMARY KEY (`c2`,`c1`) COMMENT 'custom_p0_cfname=foo;custom_p1_cfname=bar;custom_p2_cfname=baz;', KEY `kc2` (`c2`) -) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COMMENT='custom_p0_ttl_duration=9999;custom_p2_ttl_duration=5;' +) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='custom_p0_ttl_duration=9999;custom_p2_ttl_duration=5;' PARTITION BY LIST (`c1`) (PARTITION `custom_p0` VALUES IN (1,2,3) ENGINE = ROCKSDB, PARTITION `custom_p1` VALUES IN (4,5,6) ENGINE = ROCKSDB, diff --git a/storage/rocksdb/mysql-test/rocksdb/r/use_direct_io_for_flush_and_compaction.result b/storage/rocksdb/mysql-test/rocksdb/r/use_direct_io_for_flush_and_compaction.result index 8a4ee14c116..7b6ac0e9220 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/use_direct_io_for_flush_and_compaction.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/use_direct_io_for_flush_and_compaction.result @@ -7,7 +7,7 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` char(8) DEFAULT NULL, PRIMARY KEY (`pk`) -) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 +) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci INSERT INTO t1 VALUES (1, 1,'a'); INSERT INTO t1 (a,b) VALUES (2,'b'); set global rocksdb_force_flush_memtable_now=1; diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/r/rocksdb_merge_buf_size_basic.result b/storage/rocksdb/mysql-test/rocksdb_sys_vars/r/rocksdb_merge_buf_size_basic.result index 5715b198d5a..71802269bcf 100644 --- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/r/rocksdb_merge_buf_size_basic.result +++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/r/rocksdb_merge_buf_size_basic.result @@ -12,7 +12,7 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`i`), KEY `kj` (`j`), KEY `kij` (`i`,`j`) -) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 +) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP INDEX kj on t1; DROP INDEX kij ON t1; ALTER TABLE t1 ADD INDEX kj(j), ADD INDEX kij(i,j), ADD INDEX kji(j,i), ALGORITHM=INPLACE; @@ -25,7 +25,7 @@ t1 CREATE TABLE `t1` ( KEY `kj` (`j`), KEY `kij` (`i`,`j`), KEY `kji` (`j`,`i`) -) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 +) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 (a INT PRIMARY KEY, b INT) ENGINE=RocksDB; ALTER TABLE t1 ADD INDEX kb(b) comment 'rev:cf1', ALGORITHM=INPLACE; @@ -36,7 +36,7 @@ t1 CREATE TABLE `t1` ( `b` int(11) DEFAULT NULL, PRIMARY KEY (`a`), KEY `kb` (`b`) COMMENT 'rev:cf1' -) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 +) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT COUNT(*) FROM t1 FORCE INDEX(kb); COUNT(*) 100 diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/r/rocksdb_merge_combine_read_size_basic.result b/storage/rocksdb/mysql-test/rocksdb_sys_vars/r/rocksdb_merge_combine_read_size_basic.result index 5b73305cd9e..bd2038f7421 100644 --- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/r/rocksdb_merge_combine_read_size_basic.result +++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/r/rocksdb_merge_combine_read_size_basic.result @@ -12,7 +12,7 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`i`), KEY `kj` (`j`), KEY `kij` (`i`,`j`) -) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 +) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP INDEX kj on t1; DROP INDEX kij ON t1; ALTER TABLE t1 ADD INDEX kj(j), ADD INDEX kij(i,j), ADD INDEX kji(j,i), ALGORITHM=INPLACE; @@ -25,5 +25,5 @@ t1 CREATE TABLE `t1` ( KEY `kj` (`j`), KEY `kij` (`i`,`j`), KEY `kji` (`j`,`i`) -) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 +) ENGINE=ROCKSDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; diff --git a/storage/sequence/mysql-test/sequence/group_by.result b/storage/sequence/mysql-test/sequence/group_by.result index 795c32c780f..bcda2ba5c76 100644 --- a/storage/sequence/mysql-test/sequence/group_by.result +++ b/storage/sequence/mysql-test/sequence/group_by.result @@ -3,7 +3,7 @@ Table Create Table seq_1_to_15_step_2 CREATE TABLE `seq_1_to_15_step_2` ( `seq` bigint(20) unsigned NOT NULL, PRIMARY KEY (`seq`) -) ENGINE=SEQUENCE DEFAULT CHARSET=latin1 +) ENGINE=SEQUENCE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci select count(seq),sum(seq),1 from seq_1_to_15_step_2; count(seq) sum(seq) 1 8 64 1 diff --git a/storage/sequence/mysql-test/sequence/simple.result b/storage/sequence/mysql-test/sequence/simple.result index d921b80bf0f..b8bc0eadc76 100644 --- a/storage/sequence/mysql-test/sequence/simple.result +++ b/storage/sequence/mysql-test/sequence/simple.result @@ -11,7 +11,7 @@ Table Create Table seq_1_to_15_step_2 CREATE TABLE seq_1_to_15_step_2 ( seq bigint(20) unsigned NOT NULL, PRIMARY KEY (seq) -) ENGINE=SEQUENCE DEFAULT CHARSET=latin1 +) ENGINE=SEQUENCE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci show create table seq_1_to_15_step; ERROR 42S02: Table 'test.seq_1_to_15_step' doesn't exist show create table seq_1_to_15_st; @@ -21,13 +21,13 @@ Table Create Table seq_1_to_15 CREATE TABLE seq_1_to_15 ( seq bigint(20) unsigned NOT NULL, PRIMARY KEY (seq) -) ENGINE=SEQUENCE DEFAULT CHARSET=latin1 +) ENGINE=SEQUENCE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci show create table seq_1_to_1; Table Create Table seq_1_to_1 CREATE TABLE seq_1_to_1 ( seq bigint(20) unsigned NOT NULL, PRIMARY KEY (seq) -) ENGINE=SEQUENCE DEFAULT CHARSET=latin1 +) ENGINE=SEQUENCE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci show create table seq_1_to_; ERROR 42S02: Table 'test.seq_1_to_' doesn't exist show create table seq_1_t; diff --git a/storage/spider/mysql-test/spider/r/auto_increment.result b/storage/spider/mysql-test/spider/r/auto_increment.result index 6d621cc0841..c3da4575ce2 100644 --- a/storage/spider/mysql-test/spider/r/auto_increment.result +++ b/storage/spider/mysql-test/spider/r/auto_increment.result @@ -50,7 +50,7 @@ tbl_a CREATE TABLE `tbl_a` ( `col_b` varchar(20) DEFAULT 'defg', `col_c` int(11) NOT NULL DEFAULT 100, PRIMARY KEY (`col_a`) -) ENGINE=SPIDER AUTO_INCREMENT=20 DEFAULT CHARSET=latin1 COMMENT='database "auto_test_remote", table "tbl_a", srv "s_2_1", aim "0"' +) ENGINE=SPIDER AUTO_INCREMENT=20 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='database "auto_test_remote", table "tbl_a", srv "s_2_1", aim "0"' INSERT INTO tbl_a () VALUES (); INSERT INTO tbl_a () VALUES (); SHOW CREATE TABLE tbl_a; @@ -60,7 +60,7 @@ tbl_a CREATE TABLE `tbl_a` ( `col_b` varchar(20) DEFAULT 'defg', `col_c` int(11) NOT NULL DEFAULT 100, PRIMARY KEY (`col_a`) -) ENGINE=SPIDER DEFAULT CHARSET=latin1 COMMENT='database "auto_test_remote", table "tbl_a", srv "s_2_1", aim "0"' +) ENGINE=SPIDER DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='database "auto_test_remote", table "tbl_a", srv "s_2_1", aim "0"' ALTER TABLE tbl_a MODIFY col_c MEDIUMINT NOT NULL DEFAULT 100; SHOW CREATE TABLE tbl_a; Table Create Table @@ -69,7 +69,7 @@ tbl_a CREATE TABLE `tbl_a` ( `col_b` varchar(20) DEFAULT 'defg', `col_c` mediumint(9) NOT NULL DEFAULT 100, PRIMARY KEY (`col_a`) -) ENGINE=SPIDER AUTO_INCREMENT=20 DEFAULT CHARSET=latin1 COMMENT='database "auto_test_remote", table "tbl_a", srv "s_2_1", aim "0"' +) ENGINE=SPIDER AUTO_INCREMENT=20 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='database "auto_test_remote", table "tbl_a", srv "s_2_1", aim "0"' RENAME TABLE tbl_a TO tbl_x; SHOW CREATE TABLE tbl_x; Table Create Table @@ -78,7 +78,7 @@ tbl_x CREATE TABLE `tbl_x` ( `col_b` varchar(20) DEFAULT 'defg', `col_c` mediumint(9) NOT NULL DEFAULT 100, PRIMARY KEY (`col_a`) -) ENGINE=SPIDER AUTO_INCREMENT=20 DEFAULT CHARSET=latin1 COMMENT='database "auto_test_remote", table "tbl_a", srv "s_2_1", aim "0"' +) ENGINE=SPIDER AUTO_INCREMENT=20 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='database "auto_test_remote", table "tbl_a", srv "s_2_1", aim "0"' RENAME TABLE tbl_x TO tbl_a; SHOW CREATE TABLE tbl_a; Table Create Table @@ -87,7 +87,7 @@ tbl_a CREATE TABLE `tbl_a` ( `col_b` varchar(20) DEFAULT 'defg', `col_c` mediumint(9) NOT NULL DEFAULT 100, PRIMARY KEY (`col_a`) -) ENGINE=SPIDER AUTO_INCREMENT=20 DEFAULT CHARSET=latin1 COMMENT='database "auto_test_remote", table "tbl_a", srv "s_2_1", aim "0"' +) ENGINE=SPIDER AUTO_INCREMENT=20 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='database "auto_test_remote", table "tbl_a", srv "s_2_1", aim "0"' INSERT INTO tbl_a () VALUES (); INSERT INTO tbl_a () VALUES (); SHOW CREATE TABLE tbl_a; @@ -97,7 +97,7 @@ tbl_a CREATE TABLE `tbl_a` ( `col_b` varchar(20) DEFAULT 'defg', `col_c` mediumint(9) NOT NULL DEFAULT 100, PRIMARY KEY (`col_a`) -) ENGINE=SPIDER AUTO_INCREMENT=3 DEFAULT CHARSET=latin1 COMMENT='database "auto_test_remote", table "tbl_a", srv "s_2_1", aim "0"' +) ENGINE=SPIDER AUTO_INCREMENT=3 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='database "auto_test_remote", table "tbl_a", srv "s_2_1", aim "0"' MASTER_1_AUTO_INCREMENT1 SHOW CREATE TABLE tbl_a; Table Create Table @@ -106,7 +106,7 @@ tbl_a CREATE TABLE `tbl_a` ( `col_b` varchar(20) DEFAULT 'defg', `col_c` mediumint(9) NOT NULL DEFAULT 100, PRIMARY KEY (`col_a`) -) ENGINE=SPIDER AUTO_INCREMENT=30 DEFAULT CHARSET=latin1 COMMENT='database "auto_test_remote", table "tbl_a", srv "s_2_1", aim "0"' +) ENGINE=SPIDER AUTO_INCREMENT=30 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='database "auto_test_remote", table "tbl_a", srv "s_2_1", aim "0"' INSERT INTO tbl_a () VALUES (); INSERT INTO tbl_a () VALUES (); SHOW CREATE TABLE tbl_a; @@ -116,7 +116,7 @@ tbl_a CREATE TABLE `tbl_a` ( `col_b` varchar(20) DEFAULT 'defg', `col_c` mediumint(9) NOT NULL DEFAULT 100, PRIMARY KEY (`col_a`) -) ENGINE=SPIDER AUTO_INCREMENT=5 DEFAULT CHARSET=latin1 COMMENT='database "auto_test_remote", table "tbl_a", srv "s_2_1", aim "0"' +) ENGINE=SPIDER AUTO_INCREMENT=5 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='database "auto_test_remote", table "tbl_a", srv "s_2_1", aim "0"' MASTER_1_AUTO_INCREMENT2 SHOW CREATE TABLE tbl_a; Table Create Table @@ -125,7 +125,7 @@ tbl_a CREATE TABLE `tbl_a` ( `col_b` varchar(20) DEFAULT 'defg', `col_c` mediumint(9) NOT NULL DEFAULT 100, PRIMARY KEY (`col_a`) -) ENGINE=SPIDER AUTO_INCREMENT=20 DEFAULT CHARSET=latin1 COMMENT='database "auto_test_remote", table "tbl_a", srv "s_2_1", aim "0"' +) ENGINE=SPIDER AUTO_INCREMENT=20 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='database "auto_test_remote", table "tbl_a", srv "s_2_1", aim "0"' INSERT INTO tbl_a () VALUES (); INSERT INTO tbl_a () VALUES (); SHOW CREATE TABLE tbl_a; @@ -135,7 +135,7 @@ tbl_a CREATE TABLE `tbl_a` ( `col_b` varchar(20) DEFAULT 'defg', `col_c` mediumint(9) NOT NULL DEFAULT 100, PRIMARY KEY (`col_a`) -) ENGINE=SPIDER AUTO_INCREMENT=7 DEFAULT CHARSET=latin1 COMMENT='database "auto_test_remote", table "tbl_a", srv "s_2_1", aim "0"' +) ENGINE=SPIDER AUTO_INCREMENT=7 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='database "auto_test_remote", table "tbl_a", srv "s_2_1", aim "0"' select test connection child2_1; diff --git a/storage/spider/mysql-test/spider/r/direct_join.result b/storage/spider/mysql-test/spider/r/direct_join.result index 4b2c3e04bfd..398985ac02b 100644 --- a/storage/spider/mysql-test/spider/r/direct_join.result +++ b/storage/spider/mysql-test/spider/r/direct_join.result @@ -114,7 +114,7 @@ tbl_person CREATE TABLE `tbl_person` ( `region_code` varchar(50) DEFAULT NULL, `region` int(11) NOT NULL, PRIMARY KEY (`id`,`region`) USING BTREE -) ENGINE=SPIDER DEFAULT CHARSET=utf8mb3 ROW_FORMAT=DYNAMIC COMMENT='table "tbl_ncd_cm_person"' +) ENGINE=SPIDER DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci ROW_FORMAT=DYNAMIC COMMENT='table "tbl_ncd_cm_person"' PARTITION BY LIST COLUMNS(`region`) (PARTITION `pt1` VALUES IN (510411) COMMENT = 'tbl "tbl_person", srv "s_2_1"' ENGINE = SPIDER) CREATE TABLE tbl_ncd_cm_person ( @@ -133,7 +133,7 @@ tbl_ncd_cm_person CREATE TABLE `tbl_ncd_cm_person` ( `diseaseKind_id` varchar(50) DEFAULT NULL, `region` int(11) NOT NULL, PRIMARY KEY (`id`,`region`) USING BTREE -) ENGINE=SPIDER DEFAULT CHARSET=utf8mb3 ROW_FORMAT=DYNAMIC +) ENGINE=SPIDER DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci ROW_FORMAT=DYNAMIC PARTITION BY LIST COLUMNS(`region`) (PARTITION `pt1` VALUES IN (510411) COMMENT = 'tbl "tbl_ncd_cm_person", srv "s_2_1"' ENGINE = SPIDER) INSERT INTO tbl_person VALUES ('24FC3F0A5119432BAE13DD65AABAA39C', diff --git a/storage/spider/mysql-test/spider/r/timestamp.result b/storage/spider/mysql-test/spider/r/timestamp.result index 1041566d4d3..4618d9207bf 100644 --- a/storage/spider/mysql-test/spider/r/timestamp.result +++ b/storage/spider/mysql-test/spider/r/timestamp.result @@ -67,13 +67,13 @@ tbl_a CREATE TABLE `tbl_a` ( `col_ts` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), PRIMARY KEY (`col_a`), UNIQUE KEY `i_ts` (`col_ts`) -) ENGINE=SPIDER AUTO_INCREMENT=17 DEFAULT CHARSET=utf8mb4 COMMENT='database "ts_test_remote", table "tbl_a", srv "s_2_1"' +) ENGINE=SPIDER AUTO_INCREMENT=17 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='database "ts_test_remote", table "tbl_a", srv "s_2_1"' SHOW CREATE TABLE tbl_f; Table Create Table tbl_f CREATE TABLE `tbl_f` ( `col_d` date DEFAULT NULL, `col_t` time DEFAULT NULL -) ENGINE=SPIDER DEFAULT CHARSET=latin1 COMMENT='database "ts_test_remote", table "tbl_f", srv "s_2_1"' +) ENGINE=SPIDER DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='database "ts_test_remote", table "tbl_f", srv "s_2_1"' Set a different time zone that has DST SET time_zone='+01:00'; @@ -279,7 +279,7 @@ tbl_a CREATE TABLE `tbl_a` ( `col_dt` datetime DEFAULT NULL, `col_ts` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), PRIMARY KEY (`col_a`) -) ENGINE=InnoDB AUTO_INCREMENT=17 DEFAULT CHARSET=utf8mb4 +) ENGINE=InnoDB AUTO_INCREMENT=17 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci TRUNCATE TABLE mysql.general_log; connection master_1; DROP INDEX i_ts ON tbl_a; @@ -290,7 +290,7 @@ tbl_a CREATE TABLE `tbl_a` ( `col_dt` datetime DEFAULT NULL, `col_ts` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), PRIMARY KEY (`col_a`) -) ENGINE=SPIDER AUTO_INCREMENT=17 DEFAULT CHARSET=utf8mb4 COMMENT='database "ts_test_remote", table "tbl_a", srv "s_2_1"' +) ENGINE=SPIDER AUTO_INCREMENT=17 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='database "ts_test_remote", table "tbl_a", srv "s_2_1"' Retry lookups on unindexed timestamp column connection child2_1; diff --git a/storage/test_sql_discovery/mysql-test/sql_discovery/simple.result b/storage/test_sql_discovery/mysql-test/sql_discovery/simple.result index 436294eccc5..56c61cb8b39 100644 --- a/storage/test_sql_discovery/mysql-test/sql_discovery/simple.result +++ b/storage/test_sql_discovery/mysql-test/sql_discovery/simple.result @@ -91,7 +91,7 @@ show create table t1; Table Create Table t1 CREATE TABLE t1 ( a int(11) DEFAULT NULL -) ENGINE=TEST_SQL_DISCOVERY DEFAULT CHARSET=latin1 +) ENGINE=TEST_SQL_DISCOVERY DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table t1; set @@test_sql_discovery_statement='t1:create table t2 (a int)'; select * from t1; @@ -126,14 +126,14 @@ t1 CREATE TABLE t1 ( b timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), c tinyblob DEFAULT NULL, d decimal(5,2) DEFAULT NULL, - e varchar(30) CHARACTER SET ascii DEFAULT NULL, + e varchar(30) CHARACTER SET ascii COLLATE ascii_general_ci DEFAULT NULL, f geometry NOT NULL, PRIMARY KEY (a), UNIQUE KEY c (c(10)), KEY d (d,b), SPATIAL KEY f (f), FULLTEXT KEY e (e) -) ENGINE=TEST_SQL_DISCOVERY DEFAULT CHARSET=utf8mb3 MIN_ROWS=10 MAX_ROWS=100 CHECKSUM=1 COMMENT='abc' +) ENGINE=TEST_SQL_DISCOVERY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci MIN_ROWS=10 MAX_ROWS=100 CHECKSUM=1 COMMENT='abc' show status like 'handler_discover'; Variable_name Value Handler_discover 16 @@ -164,7 +164,7 @@ show create table t1; Table Create Table t1 CREATE TABLE t1 ( a int(11) DEFAULT NULL -) ENGINE=TEST_SQL_DISCOVERY DEFAULT CHARSET=latin1 +) ENGINE=TEST_SQL_DISCOVERY DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci show status like 'handler_discover'; Variable_name Value Handler_discover 17 |