follw comments

pingcap · May 10, 2022 · f92dc77 · f92dc77
1 parent b342429
commit f92dc77
Show file tree

Hide file tree

Showing 6 changed files with 72 additions and 3 deletions.
diff --git a/cmd/explaintest/r/collation_misc_disabled.result b/cmd/explaintest/r/collation_misc_disabled.result
@@ -14,20 +14,26 @@ select * from t;
 a
 t_value
 alter table t modify column a varchar(20) charset utf8;
+admin check table t;
+
 select * from t;
 a
 t_value
 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 utf8mb4;
+admin check table t;
+
 select * from t;
 a
 t_value
 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;
+admin check table t;
+
 select * from t;
 a
 t_value
@@ -41,6 +47,24 @@ alter table t collate LATIN1_GENERAL_CI charset utf8 collate utf8_bin;
 Error 1302: 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'
+drop table t;
+create table t(a varchar(20) charset latin1);
+insert into t values ("t_value");
+alter table t modify column a varchar(19) charset utf8mb4;
+admin check table t;
+
+select * from t;
+a
+t_value
+drop table t;
+create table t(a varchar(20) charset latin1);
+insert into t values ("t_value");
+alter table t modify column a varchar(19) charset utf8 collate utf8_bin;
+admin check table t;
+
+select * from t;
+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;
 use cd_test_utf8;

diff --git a/cmd/explaintest/r/collation_misc_enabled.result b/cmd/explaintest/r/collation_misc_enabled.result
@@ -14,20 +14,26 @@ select * from t;
 a
 t_value
 alter table t modify column a varchar(20) charset utf8;
+admin check table t;
+
 select * from t;
 a
 t_value
 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 utf8mb4;
+admin check table t;
+
 select * from t;
 a
 t_value
 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;
+admin check table t;
+
 select * from t;
 a
 t_value
@@ -41,6 +47,24 @@ alter table t collate LATIN1_GENERAL_CI charset utf8 collate utf8_bin;
 Error 1273: 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'
+drop table t;
+create table t(a varchar(20) charset latin1);
+insert into t values ("t_value");
+alter table t modify column a varchar(19) charset utf8mb4;
+admin check table t;
+
+select * from t;
+a
+t_value
+drop table t;
+create table t(a varchar(20) charset latin1);
+insert into t values ("t_value");
+alter table t modify column a varchar(19) charset utf8 collate utf8_bin;
+admin check table t;
+
+select * from t;
+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'

diff --git a/cmd/explaintest/t/collation_misc.test b/cmd/explaintest/t/collation_misc.test
@@ -14,18 +14,21 @@ alter table t modify column a varchar(20) charset latin1;
 select * from t;
 
 alter table t modify column a varchar(20) charset utf8;
+admin check table t;
 select * from t;
 
 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 utf8mb4;
+admin check table t;
 select * from t;
 
 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;
+admin check table t;
 select * from t;
 
 drop table t;
@@ -40,6 +43,21 @@ alter table t collate LATIN1_GENERAL_CI charset utf8 collate utf8_bin;
 --error 1253, 1273
 alter table t collate LATIN1_GENERAL_CI collate UTF8MB4_UNICODE_ci collate utf8_bin;
 
+# ChangingCharsetToUtf8 with reorg
+drop table t;
+create table t(a varchar(20) charset latin1);
+insert into t values ("t_value");
+alter table t modify column a varchar(19) charset utf8mb4;
+admin check table t;
+select * from t;
+
+drop table t;
+create table t(a varchar(20) charset latin1);
+insert into t values ("t_value");
+alter table t modify column a varchar(19) charset utf8 collate utf8_bin;
+admin check table t;
+select * from t;
+
 # TestCharsetDatabase
 create database if not exists cd_test_utf8 CHARACTER SET utf8 COLLATE utf8_bin;
 --error 1273

diff --git a/ddl/db_integration_test.go b/ddl/db_integration_test.go
@@ -770,14 +770,17 @@ func TestChangingTableCharset(t *testing.T) {
 	tk.MustGetErrCode("alter table t charset utf8 collate utf8_bin collate utf8mb4_bin collate utf8_bin;", errno.ErrCollationCharsetMismatch)
 
 	tk.MustExec("alter table t charset utf8")
+	tk.MustExec("admin check table t")
 
 	tk.MustExec("drop table if exists t")
 	tk.MustExec("create table t(a char(10), index i(a)) charset latin1 collate latin1_bin")
 	tk.MustExec("alter table t charset utf8mb4")
+	tk.MustExec("admin check table t")
 
 	tk.MustExec("drop table if exists t")
 	tk.MustExec("create table t(a char(10), index i(a)) charset latin1 collate latin1_bin")
 	tk.MustExec("alter table t charset utf8mb4 collate utf8mb4_bin")
+	tk.MustExec("admin check table t")
 
 	tk.MustGetErrCode("alter table t charset latin1 charset utf8 charset utf8mb4 collate utf8_bin;", errno.ErrConflictingDeclarations)
 

diff --git a/parser/charset/encoding_latin1.go b/parser/charset/encoding_latin1.go
@@ -18,14 +18,14 @@ import (
 )
 
 // EncodingLatin1Impl is the instance of encodingLatin1.
-// In TiDB, latin1 is an alias for utf8, so uses utf8 implementation for latin1
+// In TiDB, latin1 is an alias for utf8, so uses utf8 implementation for latin1.
 var EncodingLatin1Impl = &encodingLatin1{encodingUTF8{encodingBase{enc: encoding.Nop}}}
 
 func init() {
 	EncodingLatin1Impl.self = EncodingLatin1Impl
 }
 
-// encodingLatin1 compatibles with latin1 in old version TiDB
+// encodingLatin1 compatibles with latin1 in old version TiDB.
 type encodingLatin1 struct {
 	encodingUTF8
 }

diff --git a/parser/mysql/charset.go b/parser/mysql/charset.go
@@ -593,7 +593,7 @@ const (
 	MaxBytesOfCharacter = 4
 )
 
-// IsUTF8Charset checks if charset is utf8, utf8mb4 or latin1
+// IsUTF8Charset checks if charset is utf8, utf8mb4 or latin1.
 func IsUTF8Charset(charset string) bool {
 	return charset == UTF8Charset || charset == UTF8MB4Charset || charset == Latin1Charset
 }