Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

*: fix unexpected error when setting collate for database (#16283) #16540

Merged
merged 6 commits into from
Apr 22, 2020
Merged

*: fix unexpected error when setting collate for database (#16283) #16540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1f1fb46
cherry pick #16283 to release-4.0
bb7133 Apr 17, 2020
1ec723f
resolve conflict
bb7133 Apr 20, 2020
d820fd8
Merge branch 'release-4.0' into release-4.0-6b034d42375b
sre-bot Apr 22, 2020
a601a84
Merge branch 'release-4.0' into release-4.0-6b034d42375b
zz-jason Apr 22, 2020
d56f448
Merge branch 'release-4.0' into release-4.0-6b034d42375b
sre-bot Apr 22, 2020
b36a5f7
Merge branch 'release-4.0' into release-4.0-6b034d42375b
zz-jason Apr 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion ddl/column_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (
"github.com/pingcap/errors"
"github.com/pingcap/parser"
"github.com/pingcap/parser/ast"
"github.com/pingcap/parser/charset"
"github.com/pingcap/parser/model"
"github.com/pingcap/parser/mysql"
"github.com/pingcap/parser/terror"
Expand Down Expand Up @@ -960,7 +961,8 @@ func (s *testColumnSuite) colDefStrToFieldType(c *C, str string) *types.FieldTyp
stmt, err := parser.New().ParseOneStmt(sqlA, "", "")
c.Assert(err, IsNil)
colDef := stmt.(*ast.AlterTableStmt).Specs[0].NewColumns[0]
col, _, err := buildColumnAndConstraint(nil, 0, colDef, nil, mysql.DefaultCharset, "", mysql.DefaultCharset, "")
chs, coll := charset.GetDefaultCharsetAndCollate()
col, _, err := buildColumnAndConstraint(nil, 0, colDef, nil, chs, coll)
c.Assert(err, IsNil)
return &col.FieldType
}
Expand Down
Loading