follow comments

pingcap · Nov 4, 2021 · ea7692c · ea7692c
1 parent fe442d0
commit ea7692c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 21 deletions.
diff --git a/ddl/serial_test.go b/ddl/serial_test.go
@@ -1123,15 +1123,6 @@ func (s *testSerialSuite) TestTableLocksEnable(c *C) {
 		conf.EnableTableLock = false
 	})
 
-	tk.MustExec("SET tidb_enable_noop_functions='OFF'")
-	defer tk.MustExec("SET tidb_enable_noop_functions='OFF'")
-	tk.MustExec("lock tables t1 write")
-	tk.MustQuery("SHOW WARNINGS").Check(testkit.Rows("Warning 1235 LOCK TABLES is not supported. To enable this experimental feature, set 'enable-table-lock' in the configuration file."))
-	tk.MustExec("unlock tables")
-	tk.MustQuery("SHOW WARNINGS").Check(testkit.Rows("Warning 1235 UNLOCK TABLES is not supported. To enable this experimental feature, set 'enable-table-lock' in the configuration file."))
-	checkTableLock(c, tk.Se, "test", "t1", model.TableLockNone)
-
-	tk.MustExec("SET tidb_enable_noop_functions='WARN'")
 	tk.MustExec("lock tables t1 write")
 	tk.MustQuery("SHOW WARNINGS").Check(testkit.Rows("Warning 1235 LOCK TABLES is not supported. To enable this experimental feature, set 'enable-table-lock' in the configuration file."))
 	tk.MustExec("unlock tables")

diff --git a/executor/ddl.go b/executor/ddl.go
@@ -792,12 +792,7 @@ func (e *DDLExec) executeFlashbackTable(s *ast.FlashBackTableStmt) error {
 
 func (e *DDLExec) executeLockTables(s *ast.LockTablesStmt) error {
 	if !config.TableLockEnabled() {
-		noopFuncsMode := e.ctx.GetSessionVars().NoopFuncsMode
-		// For compatibility with mysqldump, only return warning
-		// https://github.com/pingcap/tidb/pull/29301#discussion_r742083632
-		if noopFuncsMode == variable.WarnInt || noopFuncsMode == variable.OffInt {
-			e.ctx.GetSessionVars().StmtCtx.AppendWarning(ErrFuncNotEnabled.GenWithStackByArgs("LOCK TABLES", "enable-table-lock"))
-		}
+		e.ctx.GetSessionVars().StmtCtx.AppendWarning(ErrFuncNotEnabled.GenWithStackByArgs("LOCK TABLES", "enable-table-lock"))
 		return nil
 	}
 
@@ -812,12 +807,7 @@ func (e *DDLExec) executeLockTables(s *ast.LockTablesStmt) error {
 
 func (e *DDLExec) executeUnlockTables(_ *ast.UnlockTablesStmt) error {
 	if !config.TableLockEnabled() {
-		noopFuncsMode := e.ctx.GetSessionVars().NoopFuncsMode
-		// For compatibility with mysqldump, only return warning
-		// https://github.com/pingcap/tidb/pull/29301#discussion_r742083632
-		if noopFuncsMode == variable.WarnInt || noopFuncsMode == variable.OffInt {
-			e.ctx.GetSessionVars().StmtCtx.AppendWarning(ErrFuncNotEnabled.GenWithStackByArgs("UNLOCK TABLES", "enable-table-lock"))
-		}
+		e.ctx.GetSessionVars().StmtCtx.AppendWarning(ErrFuncNotEnabled.GenWithStackByArgs("UNLOCK TABLES", "enable-table-lock"))
 		return nil
 	}
 	lockedTables := e.ctx.GetAllTableLocks()