Merge branch 'master' into exit-immediately

tests/integrations/realcluster/ts_test.go

@@ -57,39 +57,11 @@ func (s *tsSuite) TestTS() {
 	db.MustClose()
 }
 
-type msTSSuite struct {
-	clusterSuite
-}
-
 func TestMSTS(t *testing.T) {
-	suite.Run(t, &msTSSuite{
+	suite.Run(t, &tsSuite{
 		clusterSuite: clusterSuite{
 			suiteName: "ts",
 			ms:        true,
 		},
 	})
 }
-
-func (s *msTSSuite) TestTS() {
-	re := require.New(s.T())
-
-	db := OpenTestDB(s.T())
-	db.MustExec("use test")
-	db.MustExec("drop table if exists t")
-	db.MustExec("create table t(a int, index i(a))")
-	db.MustExec("insert t values (1), (2), (3)")
-	var rows int
-	err := db.inner.Raw("select count(*) from t").Row().Scan(&rows)
-	re.NoError(err)
-	re.Equal(3, rows)
-
-	re.NoError(err)
-	re.Equal(3, rows)
-
-	var ts uint64
-	err = db.inner.Begin().Raw("select @@tidb_current_ts").Scan(&ts).Rollback().Error
-	re.NoError(err)
-	re.NotEqual(0, GetTimeFromTS(ts))
-
-	db.MustClose()
-}