*: Address comments

bootstrap.go

@@ -26,6 +26,11 @@ import (
 	"github.com/pingcap/tidb/util/errors2"
 )
 
+const (
+	// CreateUserTable is the SQL statement creates User table in system db.
+	CreateUserTable = "CREATE TABLE if not exists mysql.user (Host CHAR(64), User CHAR(16), Password CHAR(41), PRIMARY KEY (Host, User));"
+)
+
 // Bootstrap initiates system DB for a store.
 func bootstrap(s *session) {
 	// Create a test database.
@@ -50,7 +55,7 @@ func bootstrap(s *session) {
 }
 
 func initUserTable(s *session) {
-	_, err := s.Execute(mysql.CreateUserTable)
+	_, err := s.Execute(CreateUserTable)
 	if err != nil {
 		log.Fatal(err)
 	}

mysqldef/const.go

@@ -122,6 +122,4 @@ const (
 	SystemDB = "mysql"
 	// UserTable is the table in system db contains user info.
 	UserTable = "User"
-	// CreateUserTable is the SQL statement creates User table in system db.
-	CreateUserTable = "CREATE TABLE if not exists mysql.user (Host CHAR(64), User CHAR(16), Password CHAR(41), PRIMARY KEY (Host, User));"
 )

stmt/stmts/create_test.go

@@ -64,7 +64,7 @@ func (s *testStmtSuite) SetUpTest(c *C) {
 	mustExec(c, s.testDB, s.useDBSql)
 
 	s.createSystemDBSQL = fmt.Sprintf("create database if not exists %s;", mysql.SystemDB)
-	s.createUserTableSQL = mysql.CreateUserTable
+	s.createUserTableSQL = tidb.CreateUserTable
 
 	mustExec(c, s.testDB, s.createSystemDBSQL)
 	mustExec(c, s.testDB, s.createUserTableSQL)

table/tables/tables_test.go

@@ -41,7 +41,7 @@ type testSuite struct {
 
 func (ts *testSuite) SetUpSuite(c *C) {
 	driver := localstore.Driver{Driver: goleveldb.MemoryDriver{}}
-	store, err := driver.Open("memory-tables-test")
+	store, err := driver.Open("memory")
 	c.Check(err, IsNil)
 	ts.store = store
 	ts.se, err = tidb.CreateSession(ts.store)