@@ -51,12 +51,6 @@ var _ = Suite(&testIntegrationSuite2{&testIntegrationSuite{}})
5151var _ = Suite (& testIntegrationSuite3 {& testIntegrationSuite {}})
5252var _ = Suite (& testIntegrationSuite4 {& testIntegrationSuite {}})
5353var _ = Suite (& testIntegrationSuite5 {& testIntegrationSuite {}})
54- var _ = Suite (& testIntegrationSuite6 {& testIntegrationSuite {}})
55- var _ = Suite (& testIntegrationSuite7 {& testIntegrationSuite {}})
56- var _ = Suite (& testIntegrationSuite8 {& testIntegrationSuite {}})
57- var _ = Suite (& testIntegrationSuite9 {& testIntegrationSuite {}})
58- var _ = Suite (& testIntegrationSuite10 {& testIntegrationSuite {}})
59- var _ = Suite (& testIntegrationSuite11 {& testIntegrationSuite {}})
6054
6155type testIntegrationSuite struct {
6256 lease time.Duration
@@ -127,14 +121,8 @@ func (s *testIntegrationSuite2) TearDownTest(c *C) {
127121type testIntegrationSuite3 struct { * testIntegrationSuite }
128122type testIntegrationSuite4 struct { * testIntegrationSuite }
129123type testIntegrationSuite5 struct { * testIntegrationSuite }
130- type testIntegrationSuite6 struct { * testIntegrationSuite }
131- type testIntegrationSuite7 struct { * testIntegrationSuite }
132- type testIntegrationSuite8 struct { * testIntegrationSuite }
133- type testIntegrationSuite9 struct { * testIntegrationSuite }
134- type testIntegrationSuite10 struct { * testIntegrationSuite }
135- type testIntegrationSuite11 struct { * testIntegrationSuite }
136-
137- func (s * testIntegrationSuite6 ) TestNoZeroDateMode (c * C ) {
124+
125+ func (s * testIntegrationSuite5 ) TestNoZeroDateMode (c * C ) {
138126 tk := testkit .NewTestKit (c , s .store )
139127
140128 defer tk .MustExec ("set session sql_mode='ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION';" )
@@ -148,7 +136,7 @@ func (s *testIntegrationSuite6) TestNoZeroDateMode(c *C) {
148136 assertErrorCode (c , tk , "create table test_zero_date(a timestamp default 0);" , mysql .ErrInvalidDefault )
149137}
150138
151- func (s * testIntegrationSuite7 ) TestInvalidDefault (c * C ) {
139+ func (s * testIntegrationSuite2 ) TestInvalidDefault (c * C ) {
152140 tk := testkit .NewTestKit (c , s .store )
153141
154142 tk .MustExec ("USE test;" )
@@ -163,7 +151,7 @@ func (s *testIntegrationSuite7) TestInvalidDefault(c *C) {
163151}
164152
165153// TestInvalidNameWhenCreateTable for issue #3848
166- func (s * testIntegrationSuite8 ) TestInvalidNameWhenCreateTable (c * C ) {
154+ func (s * testIntegrationSuite3 ) TestInvalidNameWhenCreateTable (c * C ) {
167155 tk := testkit .NewTestKit (c , s .store )
168156
169157 tk .MustExec ("USE test;" )
@@ -187,19 +175,19 @@ func (s *testIntegrationSuite3) TestCreateTableIfNotExists(c *C) {
187175
188176 tk .MustExec ("USE test;" )
189177
190- tk .MustExec ("create table t1 (a bigint)" )
191- tk .MustExec ("create table t (a bigint)" )
178+ tk .MustExec ("create table ct1 (a bigint)" )
179+ tk .MustExec ("create table ct (a bigint)" )
192180
193181 // Test duplicate create-table with `LIKE` clause
194- tk .MustExec ("create table if not exists t like t1 ;" )
182+ tk .MustExec ("create table if not exists ct like ct1 ;" )
195183 warnings := tk .Se .GetSessionVars ().StmtCtx .GetWarnings ()
196184 c .Assert (len (warnings ), GreaterEqual , 1 )
197185 lastWarn := warnings [len (warnings )- 1 ]
198186 c .Assert (terror .ErrorEqual (infoschema .ErrTableExists , lastWarn .Err ), IsTrue , Commentf ("err %v" , lastWarn .Err ))
199187 c .Assert (lastWarn .Level , Equals , stmtctx .WarnLevelNote )
200188
201189 // Test duplicate create-table without `LIKE` clause
202- tk .MustExec ("create table if not exists t (b bigint, c varchar(60));" )
190+ tk .MustExec ("create table if not exists ct (b bigint, c varchar(60));" )
203191 warnings = tk .Se .GetSessionVars ().StmtCtx .GetWarnings ()
204192 c .Assert (len (warnings ), GreaterEqual , 1 )
205193 lastWarn = warnings [len (warnings )- 1 ]
@@ -230,7 +218,7 @@ func (s *testIntegrationSuite1) TestUniqueKeyNullValue(c *C) {
230218 tk .MustExec ("admin check index t b" )
231219}
232220
233- func (s * testIntegrationSuite4 ) TestEndIncluded (c * C ) {
221+ func (s * testIntegrationSuite3 ) TestEndIncluded (c * C ) {
234222 tk := testkit .NewTestKit (c , s .store )
235223
236224 tk .MustExec ("USE test" )
@@ -252,7 +240,7 @@ func (s *testIntegrationSuite3) TestModifyColumnAfterAddIndex(c *C) {
252240 tk .MustExec (`insert into city values ("abc"), ("abd");` )
253241}
254242
255- func (s * testIntegrationSuite9 ) TestIssue2293 (c * C ) {
243+ func (s * testIntegrationSuite3 ) TestIssue2293 (c * C ) {
256244 tk := testkit .NewTestKit (c , s .store )
257245 tk .MustExec ("use test" )
258246 tk .MustExec ("create table t_issue_2293 (a int)" )
@@ -278,7 +266,7 @@ func (s *testIntegrationSuite2) TestIssue6101(c *C) {
278266 tk .MustExec ("drop table t1" )
279267}
280268
281- func (s * testIntegrationSuite4 ) TestIssue3833 (c * C ) {
269+ func (s * testIntegrationSuite3 ) TestIssue3833 (c * C ) {
282270 tk := testkit .NewTestKit (c , s .store )
283271 tk .MustExec ("use test" )
284272 tk .MustExec ("create table issue3833 (b char(0))" )
@@ -287,7 +275,7 @@ func (s *testIntegrationSuite4) TestIssue3833(c *C) {
287275 assertErrorCode (c , tk , "create table issue3833_2 (b char(0), index (b))" , tmysql .ErrWrongKeyColumn )
288276}
289277
290- func (s * testIntegrationSuite10 ) TestIssue2858And2717 (c * C ) {
278+ func (s * testIntegrationSuite1 ) TestIssue2858And2717 (c * C ) {
291279 tk := testkit .NewTestKit (c , s .store )
292280 tk .MustExec ("use test" )
293281
@@ -446,7 +434,7 @@ func (s *testIntegrationSuite5) TestMySQLErrorCode(c *C) {
446434 assertErrorCode (c , tk , sql , tmysql .ErrBadNull )
447435}
448436
449- func (s * testIntegrationSuite9 ) TestTableDDLWithFloatType (c * C ) {
437+ func (s * testIntegrationSuite3 ) TestTableDDLWithFloatType (c * C ) {
450438 s .tk = testkit .NewTestKit (c , s .store )
451439 s .tk .MustExec ("use test" )
452440 s .tk .MustExec ("drop table if exists t" )
@@ -461,7 +449,7 @@ func (s *testIntegrationSuite9) TestTableDDLWithFloatType(c *C) {
461449 s .tk .MustExec ("drop table t" )
462450}
463451
464- func (s * testIntegrationSuite10 ) TestTableDDLWithTimeType (c * C ) {
452+ func (s * testIntegrationSuite1 ) TestTableDDLWithTimeType (c * C ) {
465453 s .tk = testkit .NewTestKit (c , s .store )
466454 s .tk .MustExec ("use test" )
467455 s .tk .MustExec ("drop table if exists t" )
@@ -543,7 +531,7 @@ func (s *testIntegrationSuite2) TestUpdateMultipleTable(c *C) {
543531 tk .MustExec ("drop database umt_db" )
544532}
545533
546- func (s * testIntegrationSuite7 ) TestNullGeneratedColumn (c * C ) {
534+ func (s * testIntegrationSuite2 ) TestNullGeneratedColumn (c * C ) {
547535 tk := testkit .NewTestKit (c , s .store )
548536
549537 tk .MustExec ("use test" )
@@ -561,7 +549,7 @@ func (s *testIntegrationSuite7) TestNullGeneratedColumn(c *C) {
561549 tk .MustExec ("drop table t" )
562550}
563551
564- func (s * testIntegrationSuite9 ) TestChangingCharsetToUtf8 (c * C ) {
552+ func (s * testIntegrationSuite3 ) TestChangingCharsetToUtf8 (c * C ) {
565553 tk := testkit .NewTestKit (c , s .store )
566554
567555 tk .MustExec ("use test" )
@@ -607,7 +595,7 @@ func (s *testIntegrationSuite9) TestChangingCharsetToUtf8(c *C) {
607595 c .Assert (err , NotNil )
608596}
609597
610- func (s * testIntegrationSuite10 ) TestChangingTableCharset (c * C ) {
598+ func (s * testIntegrationSuite4 ) TestChangingTableCharset (c * C ) {
611599 tk := testkit .NewTestKit (c , s .store )
612600
613601 tk .MustExec ("USE test" )
@@ -740,7 +728,7 @@ func (s *testIntegrationSuite10) TestChangingTableCharset(c *C) {
740728 checkCharset ()
741729}
742730
743- func (s * testIntegrationSuite7 ) TestCaseInsensitiveCharsetAndCollate (c * C ) {
731+ func (s * testIntegrationSuite2 ) TestCaseInsensitiveCharsetAndCollate (c * C ) {
744732 tk := testkit .NewTestKit (c , s .store )
745733
746734 tk .MustExec ("create database if not exists test_charset_collate" )
@@ -823,7 +811,7 @@ func (s *testIntegrationSuite3) TestZeroFillCreateTable(c *C) {
823811 c .Assert (mysql .HasUnsignedFlag (zCol .Flag ), IsTrue )
824812}
825813
826- func (s * testIntegrationSuite6 ) TestBitDefaultValue (c * C ) {
814+ func (s * testIntegrationSuite5 ) TestBitDefaultValue (c * C ) {
827815 tk := testkit .NewTestKit (c , s .store )
828816 tk .MustExec ("use test" )
829817 tk .MustExec ("create table t_bit (c1 bit(10) default 250, c2 int);" )
@@ -948,7 +936,7 @@ func (s *testIntegrationSuite5) TestBackwardCompatibility(c *C) {
948936 tk .MustExec ("admin check index t idx_b" )
949937}
950938
951- func (s * testIntegrationSuite4 ) TestMultiRegionGetTableEndHandle (c * C ) {
939+ func (s * testIntegrationSuite3 ) TestMultiRegionGetTableEndHandle (c * C ) {
952940 tk := testkit .NewTestKit (c , s .store )
953941 tk .MustExec ("drop database if exists test_get_endhandle" )
954942 tk .MustExec ("create database test_get_endhandle" )
@@ -1019,7 +1007,7 @@ func (s *testIntegrationSuite) checkGetMaxTableRowID(ctx *testMaxTableRowIDConte
10191007 c .Assert (maxID , Equals , expectMaxID )
10201008}
10211009
1022- func (s * testIntegrationSuite6 ) TestGetTableEndHandle (c * C ) {
1010+ func (s * testIntegrationSuite5 ) TestGetTableEndHandle (c * C ) {
10231011 // TestGetTableEndHandle test ddl.GetTableMaxRowID method, which will return the max row id of the table.
10241012 tk := testkit .NewTestKit (c , s .store )
10251013 tk .MustExec ("drop database if exists test_get_endhandle" )
@@ -1137,7 +1125,7 @@ func (s *testIntegrationSuite1) TestCreateTableTooLarge(c *C) {
11371125 atomic .StoreUint32 (& ddl .TableColumnCountLimit , originLimit )
11381126}
11391127
1140- func (s * testIntegrationSuite8 ) TestChangeColumnPosition (c * C ) {
1128+ func (s * testIntegrationSuite3 ) TestChangeColumnPosition (c * C ) {
11411129 s .tk = testkit .NewTestKit (c , s .store )
11421130 s .tk .MustExec ("use test" )
11431131
@@ -1201,7 +1189,7 @@ func (s *testIntegrationSuite2) TestAddIndexAfterAddColumn(c *C) {
12011189 assertErrorCode (c , s .tk , sql , tmysql .ErrTooManyKeyParts )
12021190}
12031191
1204- func (s * testIntegrationSuite8 ) TestResolveCharset (c * C ) {
1192+ func (s * testIntegrationSuite3 ) TestResolveCharset (c * C ) {
12051193 s .tk = testkit .NewTestKit (c , s .store )
12061194 s .tk .MustExec ("use test" )
12071195 s .tk .MustExec ("drop table if exists resolve_charset" )
@@ -1296,7 +1284,7 @@ func (s *testIntegrationSuite1) TestAddColumnTooMany(c *C) {
12961284 assertErrorCode (c , s .tk , alterSQL , tmysql .ErrTooManyFields )
12971285}
12981286
1299- func (s * testIntegrationSuite4 ) TestAlterColumn (c * C ) {
1287+ func (s * testIntegrationSuite3 ) TestAlterColumn (c * C ) {
13001288 s .tk = testkit .NewTestKit (c , s .store )
13011289 s .tk .MustExec ("use test_db" )
13021290
@@ -1639,7 +1627,7 @@ func (s *testIntegrationSuite3) TestDefaultValueIsString(c *C) {
16391627 c .Assert (tbl .Meta ().Columns [0 ].DefaultValue , Equals , "1" )
16401628}
16411629
1642- func (s * testIntegrationSuite11 ) TestChangingDBCharset (c * C ) {
1630+ func (s * testIntegrationSuite5 ) TestChangingDBCharset (c * C ) {
16431631 tk := testkit .NewTestKit (c , s .store )
16441632
16451633 tk .MustExec ("DROP DATABASE IF EXISTS alterdb1" )
0 commit comments