From d7a38eaf1a3b3138a77156a64fba7f90a5dc6257 Mon Sep 17 00:00:00 2001 From: Alexander Barkov Date: Wed, 13 Mar 2019 15:38:33 +0400 Subject: [PATCH] MDEV-18907 Slow log: RENAME TABLE is not "admin", while ALTER TABLE..RENAME is --- mysql-test/r/log_slow_debug.result | 2 +- sql/sql_parse.cc | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/mysql-test/r/log_slow_debug.result b/mysql-test/r/log_slow_debug.result index 48314f85a1c..a823f4c2b98 100644 --- a/mysql-test/r/log_slow_debug.result +++ b/mysql-test/r/log_slow_debug.result @@ -73,6 +73,7 @@ sql_text [slow] CREATE INDEX t1a ON t1 (a) [slow] DROP INDEX t1a ON t1 [slow] ALTER TABLE t2 RENAME t2 +[slow] RENAME TABLE t2 TO t3 [slow] ALTER TABLE t4 MODIFY a INT DEFAULT 1 # # Expect none of admin DDL statements in the slow log (ON,filesort) @@ -120,7 +121,6 @@ sql_text [slow] CREATE TABLE t1 (a INT) [slow] DROP TABLE t1 [slow] CREATE TABLE t2 (a INT) -[slow] RENAME TABLE t2 TO t3 [slow] DROP TABLE t3 [slow] CREATE TABLE t4 (a INT) [slow] PREPARE stmt FROM 'ALTER TABLE t4 MODIFY a INT DEFAULT 1' diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 099d3cd4bf1..b6591c4d8c3 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -324,7 +324,8 @@ void init_update_queries(void) sql_command_flags[SQLCOM_DROP_DB]= CF_CHANGES_DATA | CF_AUTO_COMMIT_TRANS; sql_command_flags[SQLCOM_ALTER_DB_UPGRADE]= CF_AUTO_COMMIT_TRANS; sql_command_flags[SQLCOM_ALTER_DB]= CF_CHANGES_DATA | CF_AUTO_COMMIT_TRANS; - sql_command_flags[SQLCOM_RENAME_TABLE]= CF_CHANGES_DATA | CF_AUTO_COMMIT_TRANS; + sql_command_flags[SQLCOM_RENAME_TABLE]= CF_CHANGES_DATA | CF_AUTO_COMMIT_TRANS | + CF_ADMIN_COMMAND; sql_command_flags[SQLCOM_DROP_INDEX]= CF_CHANGES_DATA | CF_AUTO_COMMIT_TRANS | CF_REPORT_PROGRESS | CF_ADMIN_COMMAND; sql_command_flags[SQLCOM_CREATE_VIEW]= CF_CHANGES_DATA | CF_REEXECUTION_FRAGILE |