From 6454428cf928731f9c7d4b41787609d9f6cc4154 Mon Sep 17 00:00:00 2001
From: crazycs520 <crazycs520@gmail.com>
Date: Tue, 4 Jun 2019 14:44:44 +0800
Subject: [PATCH] ddl: fix alter table charset bug that change blob column type
to text (#10477)
---
ddl/db_integration_test.go | 11 +++++++++++
ddl/table.go | 3 ++-
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/ddl/db_integration_test.go b/ddl/db_integration_test.go
index 8cee4d1a97bc6..91259787cb708 100644
--- a/ddl/db_integration_test.go
+++ b/ddl/db_integration_test.go
@@ -44,6 +44,7 @@ import (
"github.com/pingcap/tidb/types"
"github.com/pingcap/tidb/util/mock"
"github.com/pingcap/tidb/util/testkit"
+ "github.com/pingcap/tidb/util/testutil"
)
var _ = Suite(&testIntegrationSuite1{&testIntegrationSuite{}})
@@ -738,6 +739,16 @@ func (s *testIntegrationSuite10) TestChangingTableCharset(c *C) {
c.Assert(tbl.Meta().Columns[0].Collate, Equals, "")
tk.MustExec("alter table t convert to charset utf8mb4;")
checkCharset()
+
+ tk.MustExec("drop table t")
+ tk.MustExec("create table t (a blob) character set utf8;")
+ tk.MustExec("alter table t charset=utf8mb4 collate=utf8mb4_bin;")
+ tk.MustQuery("show create table t").Check(testutil.RowsWithSep("|",
+ "t CREATE TABLE `t` (\n"+
+ " `a` blob DEFAULT NULL\n"+
+ ") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin",
+ ))
+
}
func (s *testIntegrationSuite7) TestCaseInsensitiveCharsetAndCollate(c *C) {
diff --git a/ddl/table.go b/ddl/table.go
index c81c51a227e07..a466f40e2f2af 100644
--- a/ddl/table.go
+++ b/ddl/table.go
@@ -23,6 +23,7 @@ import (
"github.com/pingcap/failpoint"
"github.com/pingcap/parser/charset"
"github.com/pingcap/parser/model"
+ field_types "github.com/pingcap/parser/types"
"github.com/pingcap/tidb/ddl/util"
"github.com/pingcap/tidb/infoschema"
"github.com/pingcap/tidb/kv"
@@ -745,7 +746,7 @@ func onModifyTableCharsetAndCollate(t *meta.Meta, job *model.Job) (ver int64, _
tblInfo.Collate = toCollate
// update column charset.
for _, col := range tblInfo.Columns {
- if typesNeedCharset(col.Tp) {
+ if field_types.HasCharset(&col.FieldType) {
col.Charset = toCharset
col.Collate = toCollate
} else {