ddl: allow more charset/collation modifications for database/t… (ping…

…cap#11085)
alivxxx · Jul 24, 2019 · 1b5f5f2 · 1b5f5f2
1 parent 7dbabf1
commit 1b5f5f2
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/ddl/ddl_api.go b/ddl/ddl_api.go
@@ -1640,8 +1640,10 @@ func modifiableCharsetAndCollation(toCharset, toCollate, origCharset, origCollat
  if !charset.ValidCharsetAndCollation(toCharset, toCollate) {
  return ErrUnknownCharacterSet.GenWithStackByArgs(toCharset, toCollate)
  }
- if toCharset == charset.CharsetUTF8MB4 && origCharset == charset.CharsetUTF8 {
- // TiDB only allow utf8 to be changed to utf8mb4.
+ if (origCharset == charset.CharsetUTF8 && toCharset == charset.CharsetUTF8MB4) ||
+ (origCharset == charset.CharsetUTF8 && toCharset == charset.CharsetUTF8) ||
+ (origCharset == charset.CharsetUTF8MB4 && toCharset == charset.CharsetUTF8MB4) {
+ // TiDB only allow utf8 to be changed to utf8mb4, or changing the collation when the charset is utf8/utf8mb4.
  return nil
  }