diff options
Diffstat (limited to 'storage/rocksdb/mysql-test/rocksdb')
30 files changed, 104 insertions, 104 deletions
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 d3801258f0c..6a43433f0ca 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 a8d5c07072c..b48efebdc35 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 @@ -90,7 +90,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 @@ -101,7 +101,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 @@ -114,7 +114,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 @@ -249,7 +249,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 5d947603ec5..e42363614da 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 @@ -90,7 +90,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 @@ -171,7 +171,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 @@ -254,7 +254,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 @@ -344,7 +344,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 @@ -427,7 +427,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 @@ -511,7 +511,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 @@ -628,7 +628,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 @@ -690,7 +690,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 @@ -787,11 +787,11 @@ 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 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 a4e00626122..48c6acc3755 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=utf8 +) ENGINE=ROCKSDB DEFAULT CHARSET=utf8 COLLATE=utf8_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 utf8 DEFAULT NULL, - `c` char(8) CHARACTER SET utf8 DEFAULT NULL, + `b` char(8) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL, + `c` char(8) CHARACTER SET utf8 COLLATE utf8_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 utf8 DEFAULT NULL, - `c` char(8) CHARACTER SET utf8 DEFAULT NULL, + `b` char(8) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL, + `c` char(8) CHARACTER SET utf8 COLLATE utf8_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 dfa5c5b2590..d3ee343fca3 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 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( @@ -65,7 +65,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); @@ -132,7 +132,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_deadlock.result b/storage/rocksdb/mysql-test/rocksdb/r/i_s_deadlock.result index 7824839808e..c83624ceee1 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(8) NOT NULL -) ENGINE=MEMORY DEFAULT CHARSET=utf8 +) ENGINE=MEMORY DEFAULT CHARSET=utf8 COLLATE=utf8_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 a70f1d15d6b..8cb905df44e 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); @@ -2483,7 +2483,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; @@ -2507,7 +2507,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 ecfc72932cc..5010477495e 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=utf8 COMMENT='standard table options' +) ENGINE=ROCKSDB DEFAULT CHARSET=utf8 COLLATE=utf8_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=utf8 COMMENT='table altered' +) ENGINE=ROCKSDB DEFAULT CHARSET=utf8 COLLATE=utf8_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=utf8 COMMENT='table altered' +) ENGINE=MEMORY DEFAULT CHARSET=utf8 COLLATE=utf8_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=utf8 COMMENT='table altered' +) ENGINE=ROCKSDB DEFAULT CHARSET=utf8 COLLATE=utf8_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 utf8 DEFAULT NULL, + `b` char(8) CHARACTER SET utf8 COLLATE utf8_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, |