diff --git a/stmt/stmts/grant.go b/stmt/stmts/grant.go
deleted file mode 100644
index a4379b6294..0000000000
--- a/stmt/stmts/grant.go
+++ /dev/null
@@ -1,561 +0,0 @@
-// Copyright 2013 The ql Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSES/QL-LICENSE file.
-
-// Copyright 2015 PingCAP, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package stmts
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/juju/errors"
-	"github.com/pingcap/tidb/column"
-	"github.com/pingcap/tidb/context"
-	"github.com/pingcap/tidb/model"
-	"github.com/pingcap/tidb/mysql"
-	"github.com/pingcap/tidb/parser/coldef"
-	"github.com/pingcap/tidb/rset"
-	"github.com/pingcap/tidb/sessionctx"
-	"github.com/pingcap/tidb/sessionctx/db"
-	"github.com/pingcap/tidb/sessionctx/variable"
-	"github.com/pingcap/tidb/stmt"
-	"github.com/pingcap/tidb/table"
-	"github.com/pingcap/tidb/util/format"
-	"github.com/pingcap/tidb/util/sqlexec"
-)
-
-/************************************************************************************
- * Grant Statement
- * See: https://dev.mysql.com/doc/refman/5.7/en/grant.html
- ************************************************************************************/
-var (
-	_ stmt.Statement = (*GrantStmt)(nil)
-)
-
-// GrantStmt grants privilege to user account.
-type GrantStmt struct {
-	Privs      []*coldef.PrivElem
-	ObjectType int
-	Level      *coldef.GrantLevel
-	Users      []*coldef.UserSpecification
-	Text       string
-}
-
-// Explain implements the stmt.Statement Explain interface.
-func (s *GrantStmt) Explain(ctx context.Context, w format.Formatter) {
-	w.Format("%s\n", s.Text)
-}
-
-// IsDDL implements the stmt.Statement IsDDL interface.
-func (s *GrantStmt) IsDDL() bool {
-	return true
-}
-
-// OriginText implements the stmt.Statement OriginText interface.
-func (s *GrantStmt) OriginText() string {
-	return s.Text
-}
-
-// SetText implements the stmt.Statement SetText interface.
-func (s *GrantStmt) SetText(text string) {
-	s.Text = text
-}
-
-// Exec implements the stmt.Statement Exec interface.
-func (s *GrantStmt) Exec(ctx context.Context) (rset.Recordset, error) {
-	// Grant for each user
-	for _, user := range s.Users {
-		// Check if user exists.
-		userName, host := parseUser(user.User)
-		exists, err := userExists(ctx, userName, host)
-		if err != nil {
-			return nil, errors.Trace(err)
-		}
-		if !exists {
-			return nil, errors.Errorf("Unknown user: %s", user.User)
-		}
-
-		// If there is no privilege entry in corresponding table, insert a new one.
-		// DB scope:		mysql.DB
-		// Table scope:		mysql.Tables_priv
-		// Column scope:	mysql.Columns_priv
-		switch s.Level.Level {
-		case coldef.GrantLevelDB:
-			err := s.checkAndInitDBPriv(ctx, userName, host)
-			if err != nil {
-				return nil, errors.Trace(err)
-			}
-		case coldef.GrantLevelTable:
-			err := s.checkAndInitTablePriv(ctx, userName, host)
-			if err != nil {
-				return nil, errors.Trace(err)
-			}
-		}
-		// Grant each priv to the user.
-		for _, priv := range s.Privs {
-			if len(priv.Cols) > 0 {
-				// Check column scope privilege entry.
-				// TODO: Check validity before insert new entry.
-				err1 := s.checkAndInitColumnPriv(ctx, userName, host, priv.Cols)
-				if err1 != nil {
-					return nil, errors.Trace(err1)
-				}
-			}
-			err2 := s.grantPriv(ctx, priv, user)
-			if err2 != nil {
-				return nil, errors.Trace(err2)
-			}
-		}
-	}
-	return nil, nil
-}
-
-// Check if DB scope privilege entry exists in mysql.DB.
-// If unexists, insert a new one.
-func (s *GrantStmt) checkAndInitDBPriv(ctx context.Context, user string, host string) error {
-	db, err := s.getTargetSchema(ctx)
-	if err != nil {
-		return errors.Trace(err)
-	}
-	ok, err := dbUserExists(ctx, user, host, db.Name.O)
-	if err != nil {
-		return errors.Trace(err)
-	}
-	if ok {
-		return nil
-	}
-	// Entry does not exists for user-host-db. Insert a new entry.
-	return initDBPrivEntry(ctx, user, host, db.Name.O)
-}
-
-// Check if table scope privilege entry exists in mysql.Tables_priv.
-// If unexists, insert a new one.
-func (s *GrantStmt) checkAndInitTablePriv(ctx context.Context, user string, host string) error {
-	db, tbl, err := s.getTargetSchemaAndTable(ctx)
-	if err != nil {
-		return errors.Trace(err)
-	}
-	ok, err := tableUserExists(ctx, user, host, db.Name.O, tbl.TableName().O)
-	if err != nil {
-		return errors.Trace(err)
-	}
-	if ok {
-		return nil
-	}
-	// Entry does not exists for user-host-db-tbl. Insert a new entry.
-	return initTablePrivEntry(ctx, user, host, db.Name.O, tbl.TableName().O)
-}
-
-// Check if column scope privilege entry exists in mysql.Columns_priv.
-// If unexists, insert a new one.
-func (s *GrantStmt) checkAndInitColumnPriv(ctx context.Context, user string, host string, cols []string) error {
-	db, tbl, err := s.getTargetSchemaAndTable(ctx)
-	if err != nil {
-		return errors.Trace(err)
-	}
-	for _, c := range cols {
-		col := column.FindCol(tbl.Cols(), c)
-		if col == nil {
-			return errors.Errorf("Unknown column: %s", c)
-		}
-		ok, err := columnPrivEntryExists(ctx, user, host, db.Name.O, tbl.TableName().O, col.Name.O)
-		if err != nil {
-			return errors.Trace(err)
-		}
-		if ok {
-			continue
-		}
-		// Entry does not exists for user-host-db-tbl-col. Insert a new entry.
-		err = initColumnPrivEntry(ctx, user, host, db.Name.O, tbl.TableName().O, col.Name.O)
-		if err != nil {
-			return errors.Trace(err)
-		}
-	}
-	return nil
-}
-
-// Insert a new row into mysql.DB with empty privilege.
-func initDBPrivEntry(ctx context.Context, user string, host string, db string) error {
-	sql := fmt.Sprintf(`INSERT INTO %s.%s (Host, User, DB) VALUES ("%s", "%s", "%s")`, mysql.SystemDB, mysql.DBTable, host, user, db)
-	_, err := ctx.(sqlexec.RestrictedSQLExecutor).ExecRestrictedSQL(ctx, sql)
-	return errors.Trace(err)
-}
-
-// Insert a new row into mysql.Tables_priv with empty privilege.
-func initTablePrivEntry(ctx context.Context, user string, host string, db string, tbl string) error {
-	sql := fmt.Sprintf(`INSERT INTO %s.%s (Host, User, DB, Table_name, Table_priv, Column_priv) VALUES ("%s", "%s", "%s", "%s", "", "")`, mysql.SystemDB, mysql.TablePrivTable, host, user, db, tbl)
-	_, err := ctx.(sqlexec.RestrictedSQLExecutor).ExecRestrictedSQL(ctx, sql)
-	return errors.Trace(err)
-}
-
-// Insert a new row into mysql.Columns_priv with empty privilege.
-func initColumnPrivEntry(ctx context.Context, user string, host string, db string, tbl string, col string) error {
-	sql := fmt.Sprintf(`INSERT INTO %s.%s (Host, User, DB, Table_name, Column_name, Column_priv) VALUES ("%s", "%s", "%s", "%s", "%s", "")`, mysql.SystemDB, mysql.ColumnPrivTable, host, user, db, tbl, col)
-	_, err := ctx.(sqlexec.RestrictedSQLExecutor).ExecRestrictedSQL(ctx, sql)
-	return errors.Trace(err)
-}
-
-// Grant priv to user in s.Level scope.
-func (s *GrantStmt) grantPriv(ctx context.Context, priv *coldef.PrivElem, user *coldef.UserSpecification) error {
-	switch s.Level.Level {
-	case coldef.GrantLevelGlobal:
-		return s.grantGlobalPriv(ctx, priv, user)
-	case coldef.GrantLevelDB:
-		return s.grantDBPriv(ctx, priv, user)
-	case coldef.GrantLevelTable:
-		if len(priv.Cols) == 0 {
-			return s.grantTablePriv(ctx, priv, user)
-		}
-		return s.grantColumnPriv(ctx, priv, user)
-	default:
-		return errors.Errorf("Unknown grant level: %#v", s.Level)
-	}
-}
-
-// Manipulate mysql.user table.
-func (s *GrantStmt) grantGlobalPriv(ctx context.Context, priv *coldef.PrivElem, user *coldef.UserSpecification) error {
-	asgns, err := composeGlobalPrivUpdate(priv.Priv)
-	if err != nil {
-		return errors.Trace(err)
-	}
-	userName, host := parseUser(user.User)
-	sql := fmt.Sprintf(`UPDATE %s.%s SET %s WHERE User="%s" AND Host="%s"`, mysql.SystemDB, mysql.UserTable, asgns, userName, host)
-	_, err = ctx.(sqlexec.RestrictedSQLExecutor).ExecRestrictedSQL(ctx, sql)
-	return errors.Trace(err)
-}
-
-// Manipulate mysql.db table.
-func (s *GrantStmt) grantDBPriv(ctx context.Context, priv *coldef.PrivElem, user *coldef.UserSpecification) error {
-	db, err := s.getTargetSchema(ctx)
-	if err != nil {
-		return errors.Trace(err)
-	}
-	asgns, err := composeDBPrivUpdate(priv.Priv)
-	if err != nil {
-		return errors.Trace(err)
-	}
-	userName, host := parseUser(user.User)
-	sql := fmt.Sprintf(`UPDATE %s.%s SET %s WHERE User="%s" AND Host="%s" AND DB="%s";`, mysql.SystemDB, mysql.DBTable, asgns, userName, host, db.Name.O)
-	_, err = ctx.(sqlexec.RestrictedSQLExecutor).ExecRestrictedSQL(ctx, sql)
-	return errors.Trace(err)
-}
-
-// Manipulate mysql.tables_priv table.
-func (s *GrantStmt) grantTablePriv(ctx context.Context, priv *coldef.PrivElem, user *coldef.UserSpecification) error {
-	db, tbl, err := s.getTargetSchemaAndTable(ctx)
-	if err != nil {
-		return errors.Trace(err)
-	}
-	userName, host := parseUser(user.User)
-	asgns, err := composeTablePrivUpdate(ctx, priv.Priv, userName, host, db.Name.O, tbl.TableName().O)
-	if err != nil {
-		return errors.Trace(err)
-	}
-	sql := fmt.Sprintf(`UPDATE %s.%s SET %s WHERE User="%s" AND Host="%s" AND DB="%s" AND Table_name="%s";`, mysql.SystemDB, mysql.TablePrivTable, asgns, userName, host, db.Name.O, tbl.TableName().O)
-	_, err = ctx.(sqlexec.RestrictedSQLExecutor).ExecRestrictedSQL(ctx, sql)
-	return errors.Trace(err)
-}
-
-// Manipulate mysql.tables_priv table.
-func (s *GrantStmt) grantColumnPriv(ctx context.Context, priv *coldef.PrivElem, user *coldef.UserSpecification) error {
-	db, tbl, err := s.getTargetSchemaAndTable(ctx)
-	if err != nil {
-		return errors.Trace(err)
-	}
-	userName, host := parseUser(user.User)
-	for _, c := range priv.Cols {
-		col := column.FindCol(tbl.Cols(), c)
-		if col == nil {
-			return errors.Errorf("Unknown column: %s", c)
-		}
-		asgns, err := composeColumnPrivUpdate(ctx, priv.Priv, userName, host, db.Name.O, tbl.TableName().O, col.Name.O)
-		if err != nil {
-			return errors.Trace(err)
-		}
-		sql := fmt.Sprintf(`UPDATE %s.%s SET %s WHERE User="%s" AND Host="%s" AND DB="%s" AND Table_name="%s" AND Column_name="%s";`, mysql.SystemDB, mysql.ColumnPrivTable, asgns, userName, host, db.Name.O, tbl.TableName().O, col.Name.O)
-		_, err = ctx.(sqlexec.RestrictedSQLExecutor).ExecRestrictedSQL(ctx, sql)
-		if err != nil {
-			return errors.Trace(err)
-		}
-	}
-	return nil
-}
-
-// Compose update stmt assignment list string for global scope privilege update.
-func composeGlobalPrivUpdate(priv mysql.PrivilegeType) (string, error) {
-	if priv == mysql.AllPriv {
-		strs := make([]string, 0, len(mysql.Priv2UserCol))
-		for _, v := range mysql.Priv2UserCol {
-			strs = append(strs, fmt.Sprintf(`%s="Y"`, v))
-		}
-		return strings.Join(strs, ", "), nil
-	}
-	col, ok := mysql.Priv2UserCol[priv]
-	if !ok {
-		return "", errors.Errorf("Unknown priv: %v", priv)
-	}
-	return fmt.Sprintf(`%s="Y"`, col), nil
-}
-
-// Compose update stmt assignment list for db scope privilege update.
-func composeDBPrivUpdate(priv mysql.PrivilegeType) (string, error) {
-	if priv == mysql.AllPriv {
-		strs := make([]string, 0, len(mysql.AllDBPrivs))
-		for _, p := range mysql.AllDBPrivs {
-			v, ok := mysql.Priv2UserCol[p]
-			if !ok {
-				return "", errors.Errorf("Unknown db privilege %v", priv)
-			}
-			strs = append(strs, fmt.Sprintf(`%s="Y"`, v))
-		}
-		return strings.Join(strs, ", "), nil
-	}
-	col, ok := mysql.Priv2UserCol[priv]
-	if !ok {
-		return "", errors.Errorf("Unknown priv: %v", priv)
-	}
-	return fmt.Sprintf(`%s="Y"`, col), nil
-}
-
-// Compose update stmt assignment list for table scope privilege update.
-func composeTablePrivUpdate(ctx context.Context, priv mysql.PrivilegeType, name string, host string, db string, tbl string) (string, error) {
-	var newTablePriv, newColumnPriv string
-	if priv == mysql.AllPriv {
-		for _, p := range mysql.AllTablePrivs {
-			v, ok := mysql.Priv2SetStr[p]
-			if !ok {
-				return "", errors.Errorf("Unknown table privilege %v", p)
-			}
-			if len(newTablePriv) == 0 {
-				newTablePriv = v
-			} else {
-				newTablePriv = fmt.Sprintf("%s,%s", newTablePriv, v)
-			}
-		}
-		for _, p := range mysql.AllColumnPrivs {
-			v, ok := mysql.Priv2SetStr[p]
-			if !ok {
-				return "", errors.Errorf("Unknown column privilege %v", p)
-			}
-			if len(newColumnPriv) == 0 {
-				newColumnPriv = v
-			} else {
-				newColumnPriv = fmt.Sprintf("%s,%s", newColumnPriv, v)
-			}
-		}
-	} else {
-		currTablePriv, currColumnPriv, err := getTablePriv(ctx, name, host, db, tbl)
-		if err != nil {
-			return "", errors.Trace(err)
-		}
-		p, ok := mysql.Priv2SetStr[priv]
-		if !ok {
-			return "", errors.Errorf("Unknown priv: %v", priv)
-		}
-		if len(currTablePriv) == 0 {
-			newTablePriv = p
-		} else {
-			newTablePriv = fmt.Sprintf("%s,%s", currTablePriv, p)
-		}
-		for _, cp := range mysql.AllColumnPrivs {
-			if priv == cp {
-				if len(currColumnPriv) == 0 {
-					newColumnPriv = p
-				} else {
-					newColumnPriv = fmt.Sprintf("%s,%s", currColumnPriv, p)
-				}
-				break
-			}
-		}
-	}
-	return fmt.Sprintf(`Table_priv="%s", Column_priv="%s", Grantor="%s"`, newTablePriv, newColumnPriv, variable.GetSessionVars(ctx).User), nil
-}
-
-// Compose update stmt assignment list for column scope privilege update.
-func composeColumnPrivUpdate(ctx context.Context, priv mysql.PrivilegeType, name string, host string, db string, tbl string, col string) (string, error) {
-	newColumnPriv := ""
-	if priv == mysql.AllPriv {
-		for _, p := range mysql.AllColumnPrivs {
-			v, ok := mysql.Priv2SetStr[p]
-			if !ok {
-				return "", errors.Errorf("Unknown column privilege %v", p)
-			}
-			if len(newColumnPriv) == 0 {
-				newColumnPriv = v
-			} else {
-				newColumnPriv = fmt.Sprintf("%s,%s", newColumnPriv, v)
-			}
-		}
-	} else {
-		currColumnPriv, err := getColumnPriv(ctx, name, host, db, tbl, col)
-		if err != nil {
-			return "", errors.Trace(err)
-		}
-		p, ok := mysql.Priv2SetStr[priv]
-		if !ok {
-			return "", errors.Errorf("Unknown priv: %v", priv)
-		}
-		if len(currColumnPriv) == 0 {
-			newColumnPriv = p
-		} else {
-			newColumnPriv = fmt.Sprintf("%s,%s", currColumnPriv, p)
-		}
-	}
-	return fmt.Sprintf(`Column_priv="%s"`, newColumnPriv), nil
-}
-
-// Helper function to check if the sql returns any row.
-func recordExists(ctx context.Context, sql string) (bool, error) {
-	rs, err := ctx.(sqlexec.RestrictedSQLExecutor).ExecRestrictedSQL(ctx, sql)
-	if err != nil {
-		return false, errors.Trace(err)
-	}
-	defer rs.Close()
-	row, err := rs.Next()
-	if err != nil {
-		return false, errors.Trace(err)
-	}
-	return row != nil, nil
-}
-
-// Check if there is an entry with key user-host-db in mysql.DB.
-func dbUserExists(ctx context.Context, name string, host string, db string) (bool, error) {
-	sql := fmt.Sprintf(`SELECT * FROM %s.%s WHERE User="%s" AND Host="%s" AND DB="%s";`, mysql.SystemDB, mysql.DBTable, name, host, db)
-	return recordExists(ctx, sql)
-}
-
-// Check if there is an entry with key user-host-db-tbl in mysql.Tables_priv.
-func tableUserExists(ctx context.Context, name string, host string, db string, tbl string) (bool, error) {
-	sql := fmt.Sprintf(`SELECT * FROM %s.%s WHERE User="%s" AND Host="%s" AND DB="%s" AND Table_name="%s";`, mysql.SystemDB, mysql.TablePrivTable, name, host, db, tbl)
-	return recordExists(ctx, sql)
-}
-
-// Check if there is an entry with key user-host-db-tbl-col in mysql.Columns_priv.
-func columnPrivEntryExists(ctx context.Context, name string, host string, db string, tbl string, col string) (bool, error) {
-	sql := fmt.Sprintf(`SELECT * FROM %s.%s WHERE User="%s" AND Host="%s" AND DB="%s" AND Table_name="%s" AND Column_name="%s";`, mysql.SystemDB, mysql.ColumnPrivTable, name, host, db, tbl, col)
-	return recordExists(ctx, sql)
-}
-
-// Get current table scope privilege set from mysql.Tables_priv.
-// Return Table_priv and Column_priv.
-func getTablePriv(ctx context.Context, name string, host string, db string, tbl string) (string, string, error) {
-	sql := fmt.Sprintf(`SELECT Table_priv, Column_priv FROM %s.%s WHERE User="%s" AND Host="%s" AND DB="%s" AND Table_name="%s";`, mysql.SystemDB, mysql.TablePrivTable, name, host, db, tbl)
-	rs, err := ctx.(sqlexec.RestrictedSQLExecutor).ExecRestrictedSQL(ctx, sql)
-	if err != nil {
-		return "", "", errors.Trace(err)
-	}
-	defer rs.Close()
-	row, err := rs.Next()
-	if err != nil {
-		return "", "", errors.Trace(err)
-	}
-	var tPriv, cPriv string
-	if row.Data[0] != nil {
-		tablePriv, ok := row.Data[0].(mysql.Set)
-		if !ok {
-			return "", "", errors.Errorf("Table Priv should be mysql.Set but get %v with type %T", row.Data[0], row.Data[0])
-		}
-		tPriv = tablePriv.Name
-	}
-	if row.Data[1] != nil {
-		columnPriv, ok := row.Data[1].(mysql.Set)
-		if !ok {
-			return "", "", errors.Errorf("Column Priv should be mysql.Set but get %v with type %T", row.Data[1], row.Data[1])
-		}
-		cPriv = columnPriv.Name
-	}
-	return tPriv, cPriv, nil
-}
-
-// Get current column scope privilege set from mysql.Columns_priv.
-// Return Column_priv.
-func getColumnPriv(ctx context.Context, name string, host string, db string, tbl string, col string) (string, error) {
-	sql := fmt.Sprintf(`SELECT Column_priv FROM %s.%s WHERE User="%s" AND Host="%s" AND DB="%s" AND Table_name="%s" AND Column_name="%s";`, mysql.SystemDB, mysql.ColumnPrivTable, name, host, db, tbl, col)
-	rs, err := ctx.(sqlexec.RestrictedSQLExecutor).ExecRestrictedSQL(ctx, sql)
-	if err != nil {
-		return "", errors.Trace(err)
-	}
-	defer rs.Close()
-	row, err := rs.Next()
-	if err != nil {
-		return "", errors.Trace(err)
-	}
-	cPriv := ""
-	if row.Data[0] != nil {
-		columnPriv, ok := row.Data[0].(mysql.Set)
-		if !ok {
-			return "", errors.Errorf("Column Priv should be mysql.Set but get %v with type %T", row.Data[0], row.Data[0])
-		}
-		cPriv = columnPriv.Name
-	}
-	return cPriv, nil
-}
-
-// Find the schema by dbName.
-func (s *GrantStmt) getTargetSchema(ctx context.Context) (*model.DBInfo, error) {
-	dbName := s.Level.DBName
-	if len(dbName) == 0 {
-		// Grant *, use current schema
-		dbName = db.GetCurrentSchema(ctx)
-		if len(dbName) == 0 {
-			return nil, errors.New("Miss DB name for grant privilege.")
-		}
-	}
-	//check if db exists
-	schema := model.NewCIStr(dbName)
-	is := sessionctx.GetDomain(ctx).InfoSchema()
-	db, ok := is.SchemaByName(schema)
-	if !ok {
-		return nil, errors.Errorf("Unknown schema name: %s", dbName)
-	}
-	return db, nil
-}
-
-// Find the schema and table by dbName and tableName.
-func (s *GrantStmt) getTargetSchemaAndTable(ctx context.Context) (*model.DBInfo, table.Table, error) {
-	db, err := s.getTargetSchema(ctx)
-	if err != nil {
-		return nil, nil, errors.Trace(err)
-	}
-	name := model.NewCIStr(s.Level.TableName)
-	is := sessionctx.GetDomain(ctx).InfoSchema()
-	tbl, err := is.TableByName(db.Name, name)
-	if err != nil {
-		return nil, nil, errors.Trace(err)
-	}
-	return db, tbl, nil
-}
-
-func userExists(ctx context.Context, name string, host string) (bool, error) {
-	sql := fmt.Sprintf(`SELECT * FROM %s.%s WHERE User="%s" AND Host="%s";`, mysql.SystemDB, mysql.UserTable, name, host)
-	rs, err := ctx.(sqlexec.RestrictedSQLExecutor).ExecRestrictedSQL(ctx, sql)
-	if err != nil {
-		return false, errors.Trace(err)
-	}
-	defer rs.Close()
-	row, err := rs.Next()
-	if err != nil {
-		return false, errors.Trace(err)
-	}
-	return row != nil, nil
-}
-
-// parse user string into username and host
-// root@localhost -> roor, localhost
-func parseUser(user string) (string, string) {
-	strs := strings.Split(user, "@")
-	return strs[0], strs[1]
-}
diff --git a/stmt/stmts/grant_test.go b/stmt/stmts/grant_test.go
deleted file mode 100644
index eae406ccf9..0000000000
--- a/stmt/stmts/grant_test.go
+++ /dev/null
@@ -1,229 +0,0 @@
-// Copyright 2015 PingCAP, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package stmts_test
-
-import (
-	"fmt"
-	"strings"
-
-	. "github.com/pingcap/check"
-	"github.com/pingcap/tidb/mysql"
-)
-
-func (s *testStmtSuite) TestGrantGlobal(c *C) {
-	tx := mustBegin(c, s.testDB)
-	// Create a new user.
-	createUserSQL := `CREATE USER 'testGlobal'@'localhost' IDENTIFIED BY '123';`
-	mustExec(c, s.testDB, createUserSQL)
-	mustCommit(c, tx)
-	// Make sure all the global privs for new user is "N".
-	for _, v := range mysql.AllDBPrivs {
-		sql := fmt.Sprintf("SELECT %s FROM mysql.User WHERE User=\"testDB\" and host=\"localhost\";", mysql.Priv2UserCol[v])
-		tx = mustBegin(c, s.testDB)
-		rows, err := tx.Query(sql)
-		c.Assert(err, IsNil)
-		matchRows(c, rows, [][]interface{}{{"N"}})
-		rows.Close()
-		mustCommit(c, tx)
-	}
-
-	// Grant each priv to the user.
-	for _, v := range mysql.AllGlobalPrivs {
-		sql := fmt.Sprintf("GRANT %s ON *.* TO 'testGlobal'@'localhost';", mysql.Priv2Str[v])
-		mustExec(c, s.testDB, sql)
-		sql = fmt.Sprintf("SELECT %s FROM mysql.User WHERE User=\"testGlobal\" and host=\"localhost\"", mysql.Priv2UserCol[v])
-		tx = mustBegin(c, s.testDB)
-		rows, err := tx.Query(sql)
-		c.Assert(err, IsNil)
-		matchRows(c, rows, [][]interface{}{{"Y"}})
-		rows.Close()
-		mustCommit(c, tx)
-	}
-
-	tx = mustBegin(c, s.testDB)
-	// Create a new user.
-	createUserSQL = `CREATE USER 'testGlobal1'@'localhost' IDENTIFIED BY '123';`
-	mustExec(c, s.testDB, createUserSQL)
-	mustExec(c, s.testDB, "GRANT ALL ON *.* TO 'testGlobal1'@'localhost';")
-	mustCommit(c, tx)
-	// Make sure all the global privs for granted user is "Y".
-	for _, v := range mysql.AllGlobalPrivs {
-		sql := fmt.Sprintf("SELECT %s FROM mysql.User WHERE User=\"testGlobal1\" and host=\"localhost\"", mysql.Priv2UserCol[v])
-		tx = mustBegin(c, s.testDB)
-		rows, err := tx.Query(sql)
-		c.Assert(err, IsNil)
-		matchRows(c, rows, [][]interface{}{{"Y"}})
-		rows.Close()
-		mustCommit(c, tx)
-	}
-}
-
-func (s *testStmtSuite) TestGrantDBScope(c *C) {
-	tx := mustBegin(c, s.testDB)
-	// Create a new user.
-	createUserSQL := `CREATE USER 'testDB'@'localhost' IDENTIFIED BY '123';`
-	mustExec(c, s.testDB, createUserSQL)
-	mustCommit(c, tx)
-	// Make sure all the db privs for new user is empty.
-	sql := fmt.Sprintf("SELECT * FROM mysql.db WHERE User=\"testDB\" and host=\"localhost\"")
-	tx = mustBegin(c, s.testDB)
-	rows, err := tx.Query(sql)
-	c.Assert(err, IsNil)
-	c.Assert(rows.Next(), IsFalse)
-	mustCommit(c, tx)
-
-	// Grant each priv to the user.
-	for _, v := range mysql.AllDBPrivs {
-		sql := fmt.Sprintf("GRANT %s ON test.* TO 'testDB'@'localhost';", mysql.Priv2Str[v])
-		mustExec(c, s.testDB, sql)
-		sql = fmt.Sprintf("SELECT %s FROM mysql.DB WHERE User=\"testDB\" and host=\"localhost\" and db=\"test\"", mysql.Priv2UserCol[v])
-		tx = mustBegin(c, s.testDB)
-		rows, err := tx.Query(sql)
-		c.Assert(err, IsNil)
-		matchRows(c, rows, [][]interface{}{{"Y"}})
-		rows.Close()
-		mustCommit(c, tx)
-	}
-
-	tx = mustBegin(c, s.testDB)
-	// Create a new user.
-	createUserSQL = `CREATE USER 'testDB1'@'localhost' IDENTIFIED BY '123';`
-	mustExec(c, s.testDB, createUserSQL)
-	mustExec(c, s.testDB, "USE test;")
-	mustExec(c, s.testDB, "GRANT ALL ON * TO 'testDB1'@'localhost';")
-	mustCommit(c, tx)
-	// Make sure all the db privs for granted user is "Y".
-	for _, v := range mysql.AllDBPrivs {
-		sql := fmt.Sprintf("SELECT %s FROM mysql.DB WHERE User=\"testDB1\" and host=\"localhost\" and db=\"test\";", mysql.Priv2UserCol[v])
-		tx = mustBegin(c, s.testDB)
-		rows, err := tx.Query(sql)
-		c.Assert(err, IsNil)
-		matchRows(c, rows, [][]interface{}{{"Y"}})
-		rows.Close()
-		mustCommit(c, tx)
-	}
-}
-
-func (s *testStmtSuite) TestTableScope(c *C) {
-	tx := mustBegin(c, s.testDB)
-	// Create a new user.
-	createUserSQL := `CREATE USER 'testTbl'@'localhost' IDENTIFIED BY '123';`
-	mustExec(c, s.testDB, createUserSQL)
-	mustExec(c, s.testDB, `CREATE TABLE test.test1(c1 int);`)
-	mustCommit(c, tx)
-	// Make sure all the table privs for new user is empty.
-	tx = mustBegin(c, s.testDB)
-	rows, err := tx.Query(`SELECT * FROM mysql.Tables_priv WHERE User="testTbl" and host="localhost" and db="test" and Table_name="test1"`)
-	c.Assert(err, IsNil)
-	c.Assert(rows.Next(), IsFalse)
-	mustCommit(c, tx)
-
-	// Grant each priv to the user.
-	for _, v := range mysql.AllTablePrivs {
-		sql := fmt.Sprintf("GRANT %s ON test.test1 TO 'testTbl'@'localhost';", mysql.Priv2Str[v])
-		mustExec(c, s.testDB, sql)
-		tx = mustBegin(c, s.testDB)
-		rows, err := tx.Query(`SELECT Table_priv FROM mysql.Tables_priv WHERE User="testTbl" and host="localhost" and db="test" and Table_name="test1";`)
-		c.Assert(err, IsNil)
-		rows.Next()
-		var p string
-		rows.Scan(&p)
-		c.Assert(strings.Index(p, mysql.Priv2SetStr[v]), Greater, -1)
-		c.Assert(rows.Next(), IsFalse)
-		rows.Close()
-		mustCommit(c, tx)
-	}
-
-	tx = mustBegin(c, s.testDB)
-	// Create a new user.
-	createUserSQL = `CREATE USER 'testTbl1'@'localhost' IDENTIFIED BY '123';`
-	mustExec(c, s.testDB, createUserSQL)
-	mustExec(c, s.testDB, "USE test;")
-	mustExec(c, s.testDB, `CREATE TABLE test2(c1 int);`)
-	// Grant all table scope privs.
-	mustExec(c, s.testDB, "GRANT ALL ON test2 TO 'testTbl1'@'localhost';")
-	mustCommit(c, tx)
-	// Make sure all the table privs for granted user are in the Table_priv set.
-	for _, v := range mysql.AllTablePrivs {
-		tx = mustBegin(c, s.testDB)
-		rows, err := tx.Query(`SELECT Table_priv FROM mysql.Tables_priv WHERE User="testTbl1" and host="localhost" and db="test" and Table_name="test2";`)
-		c.Assert(err, IsNil)
-		rows.Next()
-		var p string
-		rows.Scan(&p)
-		c.Assert(strings.Index(p, mysql.Priv2SetStr[v]), Greater, -1)
-		c.Assert(rows.Next(), IsFalse)
-		rows.Close()
-		mustCommit(c, tx)
-	}
-}
-
-func (s *testStmtSuite) TestColumnScope(c *C) {
-	tx := mustBegin(c, s.testDB)
-	// Create a new user.
-	createUserSQL := `CREATE USER 'testCol'@'localhost' IDENTIFIED BY '123';`
-	mustExec(c, s.testDB, createUserSQL)
-	mustExec(c, s.testDB, `CREATE TABLE test.test3(c1 int, c2 int);`)
-	mustCommit(c, tx)
-
-	// Make sure all the column privs for new user is empty.
-	tx = mustBegin(c, s.testDB)
-	rows, err := tx.Query(`SELECT * FROM mysql.Columns_priv WHERE User="testCol" and host="localhost" and db="test" and Table_name="test3" and Column_name="c1"`)
-	c.Assert(err, IsNil)
-	c.Assert(rows.Next(), IsFalse)
-	mustCommit(c, tx)
-	tx = mustBegin(c, s.testDB)
-	rows, err = tx.Query(`SELECT * FROM mysql.Columns_priv WHERE User="testCol" and host="localhost" and db="test" and Table_name="test3" and Column_name="c2"`)
-	c.Assert(err, IsNil)
-	c.Assert(rows.Next(), IsFalse)
-	mustCommit(c, tx)
-
-	// Grant each priv to the user.
-	for _, v := range mysql.AllColumnPrivs {
-		sql := fmt.Sprintf("GRANT %s(c1) ON test.test3 TO 'testCol'@'localhost';", mysql.Priv2Str[v])
-		mustExec(c, s.testDB, sql)
-		tx = mustBegin(c, s.testDB)
-		rows, err := tx.Query(`SELECT Column_priv FROM mysql.Columns_priv WHERE User="testCol" and host="localhost" and db="test" and Table_name="test3" and Column_name="c1";`)
-		c.Assert(err, IsNil)
-		rows.Next()
-		var p string
-		rows.Scan(&p)
-		c.Assert(strings.Index(p, mysql.Priv2SetStr[v]), Greater, -1)
-		c.Assert(rows.Next(), IsFalse)
-		rows.Close()
-		mustCommit(c, tx)
-	}
-
-	tx = mustBegin(c, s.testDB)
-	// Create a new user.
-	createUserSQL = `CREATE USER 'testCol1'@'localhost' IDENTIFIED BY '123';`
-	mustExec(c, s.testDB, createUserSQL)
-	mustExec(c, s.testDB, "USE test;")
-	// Grant all column scope privs.
-	mustExec(c, s.testDB, "GRANT ALL(c2) ON test3 TO 'testCol1'@'localhost';")
-	mustCommit(c, tx)
-	// Make sure all the column privs for granted user are in the Column_priv set.
-	for _, v := range mysql.AllColumnPrivs {
-		tx = mustBegin(c, s.testDB)
-		rows, err := tx.Query(`SELECT Column_priv FROM mysql.Columns_priv WHERE User="testCol1" and host="localhost" and db="test" and Table_name="test3" and Column_name="c2";`)
-		c.Assert(err, IsNil)
-		rows.Next()
-		var p string
-		rows.Scan(&p)
-		c.Assert(strings.Index(p, mysql.Priv2SetStr[v]), Greater, -1)
-		c.Assert(rows.Next(), IsFalse)
-		rows.Close()
-		mustCommit(c, tx)
-	}
-}