Skip to content

Commit b067340

Browse files
committed
Fix after merge test (default charset changed)
1 parent a89c104 commit b067340

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

storage/connect/mysql-test/connect/r/odbc_sqlite3.result

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Table Create Table
22
t1 CREATE TABLE `t1` (
33
`Description` char(128) NOT NULL,
44
`Attributes` varchar(256) DEFAULT NULL
5-
) ENGINE=CONNECT DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci `TABLE_TYPE`='ODBC' `CATFUNC`='Drivers'
5+
) ENGINE=CONNECT DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci `TABLE_TYPE`='ODBC' `CATFUNC`='Drivers'
66
SET NAMES utf8;
77
CREATE TABLE t1 ENGINE=CONNECT TABLE_TYPE=ODBC SRCDEF='SELECT %s, %d FROM t1' CONNECTION='Driver=SQLite3;Database=MTR_SUITE_DIR/std_data/test.sqlite3;NoWCHAR=yes' CHARSET=utf8 DATA_CHARSET=utf8;;
88
ERROR HY000: SQLExecDirect: [SQLite]near "%": syntax error (1)
@@ -11,7 +11,7 @@ SHOW CREATE TABLE t1;
1111
Table Create Table
1212
t1 CREATE TABLE `t1` (
1313
`a` varchar(64) DEFAULT NULL
14-
) ENGINE=CONNECT DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci CONNECTION='Driver=SQLite3;Database=MTR_SUITE_DIR/std_data/test.sqlite3;NoWCHAR=yes' `TABLE_TYPE`='ODBC' `DATA_CHARSET`='utf8'
14+
) ENGINE=CONNECT DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_uca1400_ai_ci CONNECTION='Driver=SQLite3;Database=MTR_SUITE_DIR/std_data/test.sqlite3;NoWCHAR=yes' `TABLE_TYPE`='ODBC' `DATA_CHARSET`='utf8'
1515
SELECT * FROM t1;
1616
a
1717
test1
@@ -23,8 +23,8 @@ CREATE TABLE t2 AS SELECT * FROM t1;
2323
SHOW CREATE TABLE t2;
2424
Table Create Table
2525
t2 CREATE TABLE `t2` (
26-
`a` varchar(64) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL
27-
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
26+
`a` varchar(64) CHARACTER SET utf8mb3 COLLATE utf8mb3_uca1400_ai_ci DEFAULT NULL
27+
) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
2828
SELECT * FROM t2;
2929
a
3030
test1

0 commit comments

Comments
 (0)