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.

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

table, infoschema, executor: fix Charset/Collation shown in column desc #10007

Merged
merged 4 commits into from
Apr 9, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
address xiekeyi98's comment
  • Loading branch information
bb7133 committed Apr 9, 2019
commit ed824ba0ae99e4c5d93e4c097e0249b220fe59fd
2 changes: 1 addition & 1 deletion executor/show_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ func (s *testSuite2) TestShow2(c *C) {
// TODO: In MySQL, the result is "autocommit ON".
tk2.MustQuery("show global variables where variable_name = 'autocommit'").Check(testkit.Rows("autocommit 1"))

// TODO & FIXME: specifying charset for national char/varchar should not be supported
// TODO: specifying charset for national char/varchar should not be supported
tk.MustExec("drop table if exists test_full_column")
tk.MustExec(`create table test_full_column(
c_int int,
Expand Down
2 changes: 1 addition & 1 deletion infoschema/tables_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ func (s *testTableSuite) TestCharacterSetCollations(c *C) {
tk.MustExec("DROP DATABASE IF EXISTS charset_collate_test")
tk.MustExec("CREATE DATABASE charset_collate_test; USE charset_collate_test")

// TODO & FIXME: specifying charset for national char/varchar should not be supported
// TODO: specifying charset for national char/varchar should not be supported
tk.MustExec(`CREATE TABLE charset_collate_col_test(
c_int int,
c_float float,
Expand Down