Merge branch 'master' into stderr

pingcap · Aug 26, 2020 · 7826b68 · 7826b68
2 parents 025d665 + cc152d5
commit 7826b68
Show file tree

Hide file tree

Showing 4 changed files with 2,246 additions and 2,227 deletions.
diff --git a/ast/ddl_test.go b/ast/ddl_test.go
@@ -272,11 +272,13 @@ func (ts *testDDLSuite) TestDDLColumnDefRestore(c *C) {
 		{"id enum('a','b')", "`id` ENUM('a','b')"},
 		{"id enum('''a''','''b''')", "`id` ENUM('''a''','''b''')"},
 		{"id enum('a\\nb','a\\tb','a\\rb')", "`id` ENUM('a\nb','a\tb','a\rb')"},
+		{"id enum('a','b') binary", "`id` ENUM('a','b') BINARY"},
 		{"id enum(0x61, 0b01100010)", "`id` ENUM('a','b')"},
 		{"id set('a','b')", "`id` SET('a','b')"},
 		{"id set('''a''','''b''')", "`id` SET('''a''','''b''')"},
 		{"id set('a\\nb','a''	\\r\\nb','a\\rb')", "`id` SET('a\nb','a''	\r\nb','a\rb')"},
 		{`id set("a'\nb","a'b\tc")`, "`id` SET('a''\nb','a''b\tc')"},
+		{"id set('a','b') binary", "`id` SET('a','b') BINARY"},
 		{"id set(0x61, 0b01100010)", "`id` SET('a','b')"},
 		{"id TEXT CHARACTER SET UTF8 COLLATE UTF8_UNICODE_CI", "`id` TEXT CHARACTER SET UTF8 COLLATE utf8_unicode_ci"},
 		{"id text character set UTF8", "`id` TEXT CHARACTER SET UTF8"},