database/tidb
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ddl: fix data race of config.TreatOldVersionUTF8AsUTF8MB4 (#9960)

Browse Source
This commit is contained in:
crazycs
2019-04-01 11:34:08 +08:00
committed by Zhang Jian
parent 833ccf8454
commit 8a7c60d406
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ddl/db_integration_test.go
View File

@ -1295,7 +1295,7 @@ func (s *testIntegrationSuite) TestAlterAlgorithm(c *C) {
s.tk.MustExec("alter table t default charset = utf8mb4, ALGORITHM=INSTANT")
}
func (s *testIntegrationSuite) TestIgnoreColumnUTF8Charset(c *C) {
func (s *testIntegrationSuite) TestTreatOldVersionUTF8AsUTF8MB4(c *C) {
s.tk = testkit.NewTestKit(c, s.store)
s.tk.MustExec("use test")
s.tk.MustExec("drop table if exists t")

2
infoschema/builder.go
View File

@ -199,7 +199,7 @@ func (b *Builder) applyCreateTable(m *meta.Meta, dbInfo *model.DBInfo, tableID i
// ConvertOldVersionUTF8ToUTF8MB4IfNeed convert old version UTF8 to UTF8MB4 if config.TreatOldVersionUTF8AsUTF8MB4 is enable.
func ConvertOldVersionUTF8ToUTF8MB4IfNeed(tbInfo *model.TableInfo) {
if !config.GetGlobalConfig().TreatOldVersionUTF8AsUTF8MB4 || tbInfo.Version >= model.TableInfoVersion2 {
if tbInfo.Version >= model.TableInfoVersion2 || !config.GetGlobalConfig().TreatOldVersionUTF8AsUTF8MB4 {
return
}
if tbInfo.Charset == charset.CharsetUTF8 {