Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dumpling: Set default driverCfg to use TLS first #39423

Merged
merged 25 commits into from
Dec 5, 2022
Merged
Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
16418de
Set default driverCfg
Daemonxiao Nov 28, 2022
e0be4e0
Update config.go
Daemonxiao Nov 28, 2022
ee243b7
Merge branch 'master' into dumpling-tls
zhangyangyu Nov 29, 2022
324a51e
Update DEPS.bzl
Daemonxiao Nov 29, 2022
2a515ae
Merge remote-tracking branch 'origin/dumpling-tls' into dumpling-tls
Daemonxiao Nov 29, 2022
f661c3b
Merge branch 'master' into dumpling-tls
Daemonxiao Nov 29, 2022
62faeb2
Update config.go
Daemonxiao Nov 29, 2022
d47f2fe
Merge remote-tracking branch 'origin/dumpling-tls' into dumpling-tls
Daemonxiao Nov 29, 2022
e90fef9
Update config.go
Daemonxiao Nov 29, 2022
2ca77a3
fix dumpling integration test
lichunzhu Nov 30, 2022
3a7048e
fix dumpling integration test
lichunzhu Nov 30, 2022
df81351
fix check-dev test
Daemonxiao Nov 30, 2022
748da5b
Merge branch 'master' into dumpling-tls
Daemonxiao Nov 30, 2022
d9ab59c
fix check-dev test
Daemonxiao Nov 30, 2022
a278e73
Merge branch 'master' into dumpling-tls
Daemonxiao Nov 30, 2022
85b517d
Merge branch 'master' into dumpling-tls
Daemonxiao Nov 30, 2022
379baa8
Merge branch 'master' into dumpling-tls
Daemonxiao Dec 1, 2022
440c24d
fix check-dev test
Daemonxiao Dec 1, 2022
c15762b
Merge remote-tracking branch 'origin/dumpling-tls' into dumpling-tls
Daemonxiao Dec 1, 2022
57de310
Merge branch 'master' into dumpling-tls
Daemonxiao Dec 1, 2022
f242e47
Update go-sql-driver/mysql to v1.7.0
Daemonxiao Dec 4, 2022
b2808c5
fix go mod tidy
Daemonxiao Dec 4, 2022
b95082b
Merge branch 'master' into dumpling-tls
Daemonxiao Dec 5, 2022
795f2a0
Merge branch 'master' into dumpling-tls
ti-chi-bot Dec 5, 2022
45d0791
Merge branch 'master' into dumpling-tls
ti-chi-bot Dec 5, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions DEPS.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -1163,8 +1163,8 @@ def go_deps():
name = "com_github_go_sql_driver_mysql",
build_file_proto_mode = "disable_global",
importpath = "github.com/go-sql-driver/mysql",
sum = "h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE=",
version = "v1.6.0",
sum = "h1:dwGE+BDjXIzXn3Ye0auI/16EXdjJkUccsJwyJEifxY0=",
version = "v1.6.1-0.20221128062620-41dd159e6ec9",
)
go_repository(
name = "com_github_go_stack_stack",
Expand Down
22 changes: 11 additions & 11 deletions cmd/explaintest/r/collation_agg_func_disabled.result
Original file line number Diff line number Diff line change
Expand Up @@ -133,13 +133,13 @@ approx_count_distinct(value collate utf8mb4_bin, value1)
create table tt(a char(10), b enum('a', 'B', 'c'), c set('a', 'B', 'c'), d json) collate utf8mb4_general_ci;
insert into tt values ("a", "a", "a", JSON_OBJECT("a", "a"));
insert into tt values ("A", "A", "A", JSON_OBJECT("A", "A"));
Error 1265: Data truncated for column 'b' at row 1
Error 1265 (01000): Data truncated for column 'b' at row 1
insert into tt values ("b", "b", "b", JSON_OBJECT("b", "b"));
Error 1265: Data truncated for column 'b' at row 1
Error 1265 (01000): Data truncated for column 'b' at row 1
insert into tt values ("B", "B", "B", JSON_OBJECT("B", "B"));
insert into tt values ("c", "c", "c", JSON_OBJECT("c", "c"));
insert into tt values ("C", "C", "C", JSON_OBJECT("C", "C"));
Error 1265: Data truncated for column 'b' at row 1
Error 1265 (01000): Data truncated for column 'b' at row 1
split table tt by (0), (1), (2), (3), (4), (5);
desc format='brief' select min(a) from tt;
id estRows task access object operator info
Expand Down Expand Up @@ -210,9 +210,9 @@ select min(b) from tt;
min(b)
B
desc format='brief' select min(b collate utf8mb4_bin) from tt;
Error 1235: This version of TiDB doesn't yet support 'use collate clause for enum or set'
Error 1235 (42000): This version of TiDB doesn't yet support 'use collate clause for enum or set'
select min(b collate utf8mb4_bin) from tt;
Error 1235: This version of TiDB doesn't yet support 'use collate clause for enum or set'
Error 1235 (42000): This version of TiDB doesn't yet support 'use collate clause for enum or set'
desc format='brief' select max(b) from tt;
id estRows task access object operator info
StreamAgg 1.00 root funcs:max(Column#8)->Column#6
Expand All @@ -223,9 +223,9 @@ select max(b) from tt;
max(b)
c
desc format='brief' select max(b collate utf8mb4_bin) from tt;
Error 1235: This version of TiDB doesn't yet support 'use collate clause for enum or set'
Error 1235 (42000): This version of TiDB doesn't yet support 'use collate clause for enum or set'
select max(b collate utf8mb4_bin) from tt;
Error 1235: This version of TiDB doesn't yet support 'use collate clause for enum or set'
Error 1235 (42000): This version of TiDB doesn't yet support 'use collate clause for enum or set'
desc format='brief' select min(c) from tt;
id estRows task access object operator info
HashAgg 1.00 root funcs:min(collation_agg_func.tt.c)->Column#6
Expand All @@ -235,9 +235,9 @@ select min(c) from tt;
min(c)
B
desc format='brief' select min(c collate utf8mb4_bin) from tt;
Error 1235: This version of TiDB doesn't yet support 'use collate clause for enum or set'
Error 1235 (42000): This version of TiDB doesn't yet support 'use collate clause for enum or set'
select min(c collate utf8mb4_bin) from tt;
Error 1235: This version of TiDB doesn't yet support 'use collate clause for enum or set'
Error 1235 (42000): This version of TiDB doesn't yet support 'use collate clause for enum or set'
desc format='brief' select max(c) from tt;
id estRows task access object operator info
HashAgg 1.00 root funcs:max(collation_agg_func.tt.c)->Column#6
Expand All @@ -247,9 +247,9 @@ select max(c) from tt;
max(c)
c
desc format='brief' select max(c collate utf8mb4_bin) from tt;
Error 1235: This version of TiDB doesn't yet support 'use collate clause for enum or set'
Error 1235 (42000): This version of TiDB doesn't yet support 'use collate clause for enum or set'
select max(c collate utf8mb4_bin) from tt;
Error 1235: This version of TiDB doesn't yet support 'use collate clause for enum or set'
Error 1235 (42000): This version of TiDB doesn't yet support 'use collate clause for enum or set'
desc format='brief' select min(d) from tt;
id estRows task access object operator info
StreamAgg 1.00 root funcs:min(collation_agg_func.tt.d)->Column#6
Expand Down
16 changes: 8 additions & 8 deletions cmd/explaintest/r/collation_agg_func_enabled.result
Original file line number Diff line number Diff line change
Expand Up @@ -207,9 +207,9 @@ select min(b) from tt;
min(b)
a
desc format='brief' select min(b collate utf8mb4_bin) from tt;
Error 1235: This version of TiDB doesn't yet support 'use collate clause for enum or set'
Error 1235 (42000): This version of TiDB doesn't yet support 'use collate clause for enum or set'
select min(b collate utf8mb4_bin) from tt;
Error 1235: This version of TiDB doesn't yet support 'use collate clause for enum or set'
Error 1235 (42000): This version of TiDB doesn't yet support 'use collate clause for enum or set'
desc format='brief' select max(b) from tt;
id estRows task access object operator info
StreamAgg 1.00 root funcs:max(Column#8)->Column#6
Expand All @@ -220,9 +220,9 @@ select max(b) from tt;
max(b)
c
desc format='brief' select max(b collate utf8mb4_bin) from tt;
Error 1235: This version of TiDB doesn't yet support 'use collate clause for enum or set'
Error 1235 (42000): This version of TiDB doesn't yet support 'use collate clause for enum or set'
select max(b collate utf8mb4_bin) from tt;
Error 1235: This version of TiDB doesn't yet support 'use collate clause for enum or set'
Error 1235 (42000): This version of TiDB doesn't yet support 'use collate clause for enum or set'
desc format='brief' select min(c) from tt;
id estRows task access object operator info
HashAgg 1.00 root funcs:min(collation_agg_func.tt.c)->Column#6
Expand All @@ -232,9 +232,9 @@ select min(c) from tt;
min(c)
a
desc format='brief' select min(c collate utf8mb4_bin) from tt;
Error 1235: This version of TiDB doesn't yet support 'use collate clause for enum or set'
Error 1235 (42000): This version of TiDB doesn't yet support 'use collate clause for enum or set'
select min(c collate utf8mb4_bin) from tt;
Error 1235: This version of TiDB doesn't yet support 'use collate clause for enum or set'
Error 1235 (42000): This version of TiDB doesn't yet support 'use collate clause for enum or set'
desc format='brief' select max(c) from tt;
id estRows task access object operator info
HashAgg 1.00 root funcs:max(collation_agg_func.tt.c)->Column#6
Expand All @@ -244,9 +244,9 @@ select max(c) from tt;
max(c)
c
desc format='brief' select max(c collate utf8mb4_bin) from tt;
Error 1235: This version of TiDB doesn't yet support 'use collate clause for enum or set'
Error 1235 (42000): This version of TiDB doesn't yet support 'use collate clause for enum or set'
select max(c collate utf8mb4_bin) from tt;
Error 1235: This version of TiDB doesn't yet support 'use collate clause for enum or set'
Error 1235 (42000): This version of TiDB doesn't yet support 'use collate clause for enum or set'
desc format='brief' select min(d) from tt;
id estRows task access object operator info
StreamAgg 1.00 root funcs:min(collation_agg_func.tt.d)->Column#6
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ drop table if exists t;
create table t(a enum('a', 'b') charset utf8mb4 collate utf8mb4_general_ci, b varchar(20));
insert into t values ("b", "c");
insert into t values ("B", "b");
Error 1265: Data truncated for column 'a' at row 1
Error 1265 (01000): Data truncated for column 'a' at row 1
select * from t where 'B' collate utf8mb4_general_ci in (a);
a b
select * from t where 'B' collate utf8mb4_bin in (a);
Expand Down Expand Up @@ -82,7 +82,7 @@ drop table if exists t;
create table t(a set('a', 'b') charset utf8mb4 collate utf8mb4_general_ci, b varchar(20));
insert into t values ("b", "c");
insert into t values ("B", "b");
Error 1265: Data truncated for column 'a' at row 1
Error 1265 (01000): Data truncated for column 'a' at row 1
select * from t where 'B' collate utf8mb4_general_ci in (a);
a b
select * from t where 'B' collate utf8mb4_bin in (a);
Expand Down
8 changes: 4 additions & 4 deletions cmd/explaintest/r/collation_misc_disabled.result
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ select * from t;
a
t_value
alter table t modify column a varchar(20) charset utf8;
Error 8200: Unsupported modify charset from latin1 to utf8
Error 8200 (HY000): Unsupported modify charset from latin1 to utf8
drop table t;
create table t(a varchar(20) charset latin1);
insert into t values ("t_value");
Expand All @@ -38,13 +38,13 @@ drop table t;
create table t(a varchar(20) charset latin1);
insert into t values ("t_value");
alter table t modify column a varchar(20) charset utf8 collate utf8_bin;
Error 8200: Unsupported modify charset from latin1 to utf8
Error 8200 (HY000): Unsupported modify charset from latin1 to utf8
alter table t modify column a varchar(20) charset utf8mb4 collate utf8bin;
[ddl:1273]Unknown collation: 'utf8bin'
alter table t collate LATIN1_GENERAL_CI charset utf8 collate utf8_bin;
Error 1302: Conflicting declarations: 'CHARACTER SET latin1' and 'CHARACTER SET utf8'
Error 1302 (HY000): Conflicting declarations: 'CHARACTER SET latin1' and 'CHARACTER SET utf8'
alter table t collate LATIN1_GENERAL_CI collate UTF8MB4_UNICODE_ci collate utf8_bin;
Error 1253: COLLATION 'utf8mb4_unicode_ci' is not valid for CHARACTER SET 'latin1'
Error 1253 (42000): COLLATION 'utf8mb4_unicode_ci' is not valid for CHARACTER SET 'latin1'
drop table t;
create table t(a varchar(20) charset latin1);
insert into t values ("t_value");
Expand Down
14 changes: 7 additions & 7 deletions cmd/explaintest/r/collation_misc_enabled.result
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ select * from t;
a
t_value
alter table t modify column a varchar(20) charset utf8;
Error 8200: Unsupported modify charset from latin1 to utf8
Error 8200 (HY000): Unsupported modify charset from latin1 to utf8
drop table t;
create table t(a varchar(20) charset latin1);
insert into t values ("t_value");
Expand All @@ -38,13 +38,13 @@ drop table t;
create table t(a varchar(20) charset latin1);
insert into t values ("t_value");
alter table t modify column a varchar(20) charset utf8 collate utf8_bin;
Error 8200: Unsupported modify charset from latin1 to utf8
Error 8200 (HY000): Unsupported modify charset from latin1 to utf8
alter table t modify column a varchar(20) charset utf8mb4 collate utf8bin;
[ddl:1273]Unknown collation: 'utf8bin'
alter table t collate LATIN1_GENERAL_CI charset utf8 collate utf8_bin;
Error 1273: Unsupported collation when new collation is enabled: 'latin1_general_ci'
Error 1273 (HY000): Unsupported collation when new collation is enabled: 'latin1_general_ci'
alter table t collate LATIN1_GENERAL_CI collate UTF8MB4_UNICODE_ci collate utf8_bin;
Error 1273: Unsupported collation when new collation is enabled: 'latin1_general_ci'
Error 1273 (HY000): Unsupported collation when new collation is enabled: 'latin1_general_ci'
drop table t;
create table t(a varchar(20) charset latin1);
insert into t values ("t_value");
Expand All @@ -56,7 +56,7 @@ a
t_value
create database if not exists cd_test_utf8 CHARACTER SET utf8 COLLATE utf8_bin;
create database if not exists cd_test_latin1 CHARACTER SET latin1 COLLATE latin1_swedish_ci;
Error 1273: Unsupported collation when new collation is enabled: 'latin1_swedish_ci'
Error 1273 (HY000): Unsupported collation when new collation is enabled: 'latin1_swedish_ci'
use cd_test_utf8;
select @@character_set_database;
@@character_set_database
Expand All @@ -65,15 +65,15 @@ select @@collation_database;
@@collation_database
utf8_bin
use cd_test_latin1;
Error 1049: Unknown database 'cd_test_latin1'
Error 1049 (42000): Unknown database 'cd_test_latin1'
select @@character_set_database;
@@character_set_database
utf8
select @@collation_database;
@@collation_database
utf8_bin
create database if not exists test_db CHARACTER SET latin1 COLLATE latin1_swedish_ci;
Error 1273: Unsupported collation when new collation is enabled: 'latin1_swedish_ci'
Error 1273 (HY000): Unsupported collation when new collation is enabled: 'latin1_swedish_ci'
with cte as (select cast('2010-09-09' as date) a union select '2010-09-09 ') select count(*) from cte;
count(*)
1
Expand Down
10 changes: 5 additions & 5 deletions cmd/explaintest/r/collation_pointget_disabled.result
Original file line number Diff line number Diff line change
Expand Up @@ -111,15 +111,15 @@ select *, a, b from t tmp where tmp.a = "aa";
a b a b
aa bb aa bb
select a from t where xxxxx.a = "aa";
Error 1054: Unknown column 'xxxxx.a' in 'where clause'
Error 1054 (42S22): Unknown column 'xxxxx.a' in 'where clause'
select xxxxx.a from t where a = "aa";
Error 1054: Unknown column 'xxxxx.a' in 'field list'
Error 1054 (42S22): Unknown column 'xxxxx.a' in 'field list'
select a from t tmp where t.a = "aa";
Error 1054: Unknown column 't.a' in 'where clause'
Error 1054 (42S22): Unknown column 't.a' in 'where clause'
select t.a from t tmp where a = "aa";
Error 1054: Unknown column 't.a' in 'field list'
Error 1054 (42S22): Unknown column 't.a' in 'field list'
select t.* from t tmp where a = "aa";
Error 1051: Unknown table 't'
Error 1051 (42S02): Unknown table 't'
drop table if exists t;
create table t(a char(4) primary key, b char(4));
insert into t values("aa", "bb");
Expand Down
10 changes: 5 additions & 5 deletions cmd/explaintest/r/collation_pointget_enabled.result
Original file line number Diff line number Diff line change
Expand Up @@ -124,15 +124,15 @@ select *, a, b from t tmp where tmp.a = "aa";
a b a b
aa bb aa bb
select a from t where xxxxx.a = "aa";
Error 1054: Unknown column 'xxxxx.a' in 'where clause'
Error 1054 (42S22): Unknown column 'xxxxx.a' in 'where clause'
select xxxxx.a from t where a = "aa";
Error 1054: Unknown column 'xxxxx.a' in 'field list'
Error 1054 (42S22): Unknown column 'xxxxx.a' in 'field list'
select a from t tmp where t.a = "aa";
Error 1054: Unknown column 't.a' in 'where clause'
Error 1054 (42S22): Unknown column 't.a' in 'where clause'
select t.a from t tmp where a = "aa";
Error 1054: Unknown column 't.a' in 'field list'
Error 1054 (42S22): Unknown column 't.a' in 'field list'
select t.* from t tmp where a = "aa";
Error 1051: Unknown table 't'
Error 1051 (42S02): Unknown table 't'
drop table if exists t;
create table t(a char(4) primary key, b char(4));
insert into t values("aa", "bb");
Expand Down
10 changes: 5 additions & 5 deletions cmd/explaintest/r/cte.result
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ c1 c2
1 1
1 2
with recursive tbl_0 (col_943,col_944,col_945,col_946,col_947) AS ( with recursive tbl_0 (col_948,col_949,col_950,col_951,col_952) AS ( select 1, 2,3,4,5 UNION ALL select col_948 + 1,col_949 + 1,col_950 + 1,col_951 + 1,col_952 + 1 from tbl_0 where col_948 < 5 ) select col_948,col_949,col_951,col_950,col_952 from tbl_0 UNION ALL select col_943 + 1,col_944 + 1,col_945 + 1,col_946 + 1,col_947 + 1 from tbl_0 where col_943 < 5 ) select * from tbl_0;
Error 1054: Unknown column 'col_943' in 'where clause'
Error 1054 (42S22): Unknown column 'col_943' in 'where clause'
with recursive cte1 (c1, c2) as (select 1, '1' union select concat(c1, 1), c2 + 1 from cte1 where c1 < 100) select * from cte1;
c1 c2
1 1
Expand Down Expand Up @@ -283,15 +283,15 @@ union all
select 3, 0 from qn
)
select * from qn;
Error 1222: The used SELECT statements have a different number of columns
Error 1222 (21000): The used SELECT statements have a different number of columns
with recursive cte1 as (select 1 union all (select 1 from cte1 limit 10)) select * from cte1;
Error 1235: This version of TiDB doesn't yet support 'ORDER BY / LIMIT / SELECT DISTINCT in recursive query block of Common Table Expression'
Error 1235 (42000): This version of TiDB doesn't yet support 'ORDER BY / LIMIT / SELECT DISTINCT in recursive query block of Common Table Expression'
with recursive qn as (select 123 as a union all select null from qn where a is not null) select * from qn;
a
123
NULL
with recursive q (b) as (select 1, 1 union all select 1, 1 from q) select b from q;
Error 1353: In definition of view, derived table or common table expression, SELECT list and column names list have different column counts
Error 1353 (HY000): In definition of view, derived table or common table expression, SELECT list and column names list have different column counts
drop table if exists t1;
create table t1(a int);
insert into t1 values(1);
Expand Down Expand Up @@ -356,7 +356,7 @@ drop table if exists t1;
create table t1(c1 bigint unsigned);
insert into t1 values(0);
with recursive cte1 as (select c1 - 1 c1 from t1 union all select c1 - 1 c1 from cte1 where c1 != 0) select * from cte1 dt1, cte1 dt2;
Error 1690: BIGINT UNSIGNED value is out of range in '(test.t1.c1 - 1)'
Error 1690 (22003): BIGINT UNSIGNED value is out of range in '(test.t1.c1 - 1)'
drop table if exists t;
create table t(a int, b int, key (b));
desc with cte as (select * from t) select * from cte;
Expand Down
20 changes: 10 additions & 10 deletions cmd/explaintest/r/new_character_set_builtin.result
Original file line number Diff line number Diff line change
Expand Up @@ -399,17 +399,17 @@ a like 0xe4b880 b like 0xd2bb
1 1
1 1
select a = 0xb6fe from t;
Error 3854: Cannot convert string '\xB6\xFE' from binary to utf8mb4
Error 3854 (HY000): Cannot convert string '\xB6\xFE' from binary to utf8mb4
select b = 0xe4ba8c from t;
Error 3854: Cannot convert string '\xE4\xBA\x8C' from binary to gbk
Error 3854 (HY000): Cannot convert string '\xE4\xBA\x8C' from binary to gbk
select concat(a, 0xb6fe) from t;
Error 3854: Cannot convert string '\xB6\xFE' from binary to utf8mb4
Error 3854 (HY000): Cannot convert string '\xB6\xFE' from binary to utf8mb4
select concat(b, 0xe4ba8c) from t;
Error 3854: Cannot convert string '\xE4\xBA\x8C' from binary to gbk
Error 3854 (HY000): Cannot convert string '\xE4\xBA\x8C' from binary to gbk
select concat(convert('a' using gbk), 0x3fff) from t;
Error 3854: Cannot convert string '?\xFF' from binary to gbk
Error 3854 (HY000): Cannot convert string '?\xFF' from binary to gbk
select concat(convert('a' using gbk), 0x3fffffffffffffff) from t;
Error 3854: Cannot convert string '?\xFF\xFF\xFF\xFF\xFF...' from binary to gbk
Error 3854 (HY000): Cannot convert string '?\xFF\xFF\xFF\xFF\xFF...' from binary to gbk
set @@tidb_enable_vectorized_expression = false;
select hex(concat(a, c)), hex(concat(b, c)) from t;
hex(concat(a, c)) hex(concat(b, c))
Expand Down Expand Up @@ -502,13 +502,13 @@ a like 0xe4b880 b like 0xd2bb
1 1
1 1
select a = 0xb6fe from t;
Error 3854: Cannot convert string '\xB6\xFE' from binary to utf8mb4
Error 3854 (HY000): Cannot convert string '\xB6\xFE' from binary to utf8mb4
select b = 0xe4ba8c from t;
Error 3854: Cannot convert string '\xE4\xBA\x8C' from binary to gbk
Error 3854 (HY000): Cannot convert string '\xE4\xBA\x8C' from binary to gbk
select concat(a, 0xb6fe) from t;
Error 3854: Cannot convert string '\xB6\xFE' from binary to utf8mb4
Error 3854 (HY000): Cannot convert string '\xB6\xFE' from binary to utf8mb4
select concat(b, 0xe4ba8c) from t;
Error 3854: Cannot convert string '\xE4\xBA\x8C' from binary to gbk
Error 3854 (HY000): Cannot convert string '\xE4\xBA\x8C' from binary to gbk
drop table if exists t;
create table t (a char(20) charset utf8mb4, b char(20) charset gbk, c binary(20));
insert into t values ('一二三', '一二三', '一二三');
Expand Down
6 changes: 3 additions & 3 deletions cmd/explaintest/r/new_character_set_invalid.result
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ drop table if exists t;
create table t (a varchar(255) charset gbk, b varchar(255) charset ascii, c varchar(255) charset utf8);
insert into t values ('中文', 'asdf', '字符集');
insert into t values ('À', 'ø', '😂');
Error 1366: Incorrect string value '\xC3\x80' for column 'a'
Error 1366 (HY000): Incorrect string value '\xC3\x80' for column 'a'
insert into t values ('中文À中文', 'asdføfdsa', '字符集😂字符集');
Error 1366: Incorrect string value '\xC3\x80' for column 'a'
Error 1366 (HY000): Incorrect string value '\xC3\x80' for column 'a'
insert into t values (0x4040ffff, 0x4040ffff, 0x4040ffff);
Error 1366: Incorrect string value '\xFF\xFF' for column 'a'
Error 1366 (HY000): Incorrect string value '\xFF\xFF' for column 'a'
select * from t;
a b c
中文 asdf 字符集
Expand Down
6 changes: 3 additions & 3 deletions cmd/explaintest/r/select.result
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,9 @@ SELECT * from t a left join t2 b on a.c1 = b.c1;
c1 c2 c3 c1 c2
1 2 3 1 2
SELECT * from (SELECT 1, 1) as a;
Error 1060: Duplicate column name '1'
Error 1060 (42S21): Duplicate column name '1'
SELECT * from (SELECT * FROM t, t2) as a;
Error 1060: Duplicate column name 'c1'
Error 1060 (42S21): Duplicate column name 'c1'
DROP TABLE IF EXISTS t;
CREATE TABLE t (c1 INT, c2 INT);
INSERT INTO t VALUES (1, 2), (1, 1), (1, 3);
Expand Down Expand Up @@ -656,5 +656,5 @@ drop table if exists t3;
create table t3(a char(10), primary key (a));
insert into t3 values ('a');
select * from t3 where a > 0x80;
Error 1105: Cannot convert string '\x80' from binary to utf8mb4
Error 1105 (HY000): Cannot convert string '\x80' from binary to utf8mb4
set @@tidb_enable_outer_join_reorder=false;
Loading