revert to_binary before insert for blob columns

pingcap · Dec 20, 2021 · 7e82fe3 · 7e82fe3
1 parent 1cc6321
commit 7e82fe3
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 26 deletions.
diff --git a/cmd/explaintest/r/new_character_set.result b/cmd/explaintest/r/new_character_set.result
@@ -56,11 +56,3 @@ a	hex(a)
 中文	E4B8ADE69687
 涓?枃	E6B6933FE69E83
 set @@character_set_client = 'utf8mb4';
-drop table if exists t;
-create table t(a blob(100));
-set names gbk;
-insert into t values ("你好");
-select hex(a) from t;
-hex(a)
-E4BDA0E5A5BD
-set names utf8mb4;
diff --git a/cmd/explaintest/t/new_character_set.test b/cmd/explaintest/t/new_character_set.test
@@ -39,10 +39,3 @@ prepare p1 from "insert into t values ('中文');";
 execute p1;
 select a, hex(a) from t;
 set @@character_set_client = 'utf8mb4';
-
-drop table if exists t;
-create table t(a blob(100));
-set names gbk;
-insert into t values ("你好");
-select hex(a) from t;
-set names utf8mb4;
diff --git a/table/column.go b/table/column.go
@@ -346,17 +346,6 @@ func validateStringDatum(ctx sessionctx.Context, origin, casted *types.Datum, co
 	if fromBinary && toBinary {
 		return nil
 	}
-	if toBinary {
-		coll, err := charset.GetCollationByName(origin.Collation())
-		if err != nil {
-			logutil.BgLogger().Warn("unknown collation", zap.Error(err))
-			return nil
-		}
-		enc := charset.FindEncoding(coll.CharsetName)
-		replace, _ := enc.Transform(nil, casted.GetBytes(), charset.OpEncodeNoErr)
-		casted.SetBytesAsString(replace, charset.CollationUTF8MB4, 0)
-		return nil
-	}
 	enc := charset.FindEncoding(col.Charset)
 	// Skip utf8 check if possible.
 	if enc.Tp() == charset.EncodingTpUTF8 && ctx.GetSessionVars().SkipUTF8Check {