fix merge conflict

pingcap · Nov 11, 2021 · 9642fb1 · 9642fb1
1 parent b4cb9e6
commit 9642fb1
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/cmd/explaintest/r/new_character_set_builtin.result b/cmd/explaintest/r/new_character_set_builtin.result
@@ -232,22 +232,22 @@ insert into t values ('65'), ('123456'), ('123456789');
 select char(a using gbk), char(a using utf8), char(a) from t;
 char(a using gbk)	char(a using utf8)	char(a)
 A	A	A
-�@	�@	�@
-[�	[�	[�
+釦	�@	�@
+NULL	[�	[�
 select char(a using gbk) from t;
 char(a using gbk)
 A
-�@
-[�
+釦
+NULL
 set @@tidb_enable_vectorized_expression = true;
 select char(a using gbk), char(a using utf8), char(a) from t;
 char(a using gbk)	char(a using utf8)	char(a)
 A	A	A
-�@	�@	�@
-[�	[�	[�
+釦	�@	�@
+NULL	[�	[�
 select char(a using gbk) from t;
 char(a using gbk)
 A
-�@
-[�
+釦
+NULL
 set @@tidb_enable_vectorized_expression = false;