summaryrefslogtreecommitdiff
path: root/sql/log_slow.h
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2017-07-21 19:56:41 +0300
committerSergei Golubchik <serg@mariadb.org>2017-08-24 01:05:51 +0200
commit21518ab2e4538e1a6c9b3a136a93885a98492218 (patch)
tree53ead8ca7b462bfa253f67e53628c44455318c56 /sql/log_slow.h
parent536215e32fc43aa423684e9807640dcf3453924b (diff)
downloadmariadb-git-21518ab2e4538e1a6c9b3a136a93885a98492218.tar.gz
New option for slow logging (log_slow_disable_statements)
This fixes MDEV-7742 and MDEV-8305 (Allow user to specify if stored procedures should be logged in the slow and general log) New functionality: - Added new variables log_slow_disable_statements and log_disable_statements that can be used to disable logging of certain queries to slow and general log. Currently supported options are 'admin', 'call', 'slave' and 'sp'. Defaults are as before. Only 'sp' (stored procedure statements) is disabled for slow and general_log. - Slow log to files now includes the following new information: - When logging stored procedure statements the name of stored procedure is logged. - Number of created tmp_tables, tmp_disk_tables and the space used by temporary tables. - When logging 'call', the logged status now contains the sum of all included statements. Before only 'time' was correct. - Added filsort_priority_queue as an option for log_slow_filter (this variable existed before, but was not exposed) - Added support for BIT types in my_getopt() Mapped some old variables to bitmaps (old variables can still be used) - Variable 'log_queries_not_using_indexes' is mapped to log_slow_filter='not_using_index' - Variable 'log_slow_slave_statements' is mapped to log_slow_disabled_statements='slave' - Variable 'log_slow_admin_statements' is mapped to log_slow_disabled_statements='admin' - All the above variables are changed to session variables from global variables Other things: - Simplified LOGGER::log_command. We don't need to check for super if OPTION_LOG_OFF is set as this flag can only be set if one is a super user. - Removed some setting of enable_slow_log as it's guaranteed to be set by mysql_parse() - mysql_admin_table() now sets thd->enable_slow_log - Added prepare_logs_for_admin_command() to reset thd->enable_slow_log if needed. - Added new functions to store, restore and add slow query status - Added new functions to store and restore query start time - Reorganized Sub_statement_state according to types - Added code in dispatch_command() to ensure that thd->reset_for_next_command() is always called for a query. - Added thd->last_sql_command to simplify checking of what was the type of the last command. Needed when logging to slow log as lex->sql_command may have changed before slow logging is called. - Moved QPLAN_TMP_... to where status for tmp tables are updated - Added new THD variable, affected_rows, to be able to correctly log number of affected rows to slow log.
Diffstat (limited to 'sql/log_slow.h')
-rw-r--r--sql/log_slow.h30
1 files changed, 23 insertions, 7 deletions
diff --git a/sql/log_slow.h b/sql/log_slow.h
index c52722f0cd7..069c35173b9 100644
--- a/sql/log_slow.h
+++ b/sql/log_slow.h
@@ -15,6 +15,9 @@
/* Defining what to log to slow log */
+#ifndef LOG_SLOW_INCLUDED
+#define LOG_SLOW_INCLUDED
+
#define LOG_SLOW_VERBOSITY_INIT 0
#define LOG_SLOW_VERBOSITY_INNODB (1U << 0)
#define LOG_SLOW_VERBOSITY_QUERY_PLAN (1U << 1)
@@ -25,13 +28,26 @@
#define QPLAN_ADMIN (1U << 0)
#define QPLAN_FILESORT (1U << 1)
#define QPLAN_FILESORT_DISK (1U << 2)
-#define QPLAN_FULL_JOIN (1U << 3)
-#define QPLAN_FULL_SCAN (1U << 4)
-#define QPLAN_QC (1U << 5)
-#define QPLAN_QC_NO (1U << 6)
-#define QPLAN_TMP_DISK (1U << 7)
-#define QPLAN_TMP_TABLE (1U << 8)
-#define QPLAN_FILESORT_PRIORITY_QUEUE (1U << 9)
+#define QPLAN_FILESORT_PRIORITY_QUEUE (1U << 3)
+#define QPLAN_FULL_JOIN (1U << 4)
+#define QPLAN_FULL_SCAN (1U << 5)
+#define QPLAN_NOT_USING_INDEX (1U << 6)
+#define QPLAN_QC (1U << 7)
+#define QPLAN_QC_NO (1U << 8)
+#define QPLAN_TMP_TABLE (1U << 9)
+#define QPLAN_TMP_DISK (1U << 10)
/* ... */
#define QPLAN_MAX (1UL << 31) /* reserved as placeholder */
+
+/* Bits for log_slow_disabled_statements */
+#define LOG_SLOW_DISABLE_ADMIN (1 << 0)
+#define LOG_SLOW_DISABLE_CALL (1 << 1)
+#define LOG_SLOW_DISABLE_SLAVE (1 << 2)
+#define LOG_SLOW_DISABLE_SP (1 << 3)
+
+/* Bits for log_disabled_statements */
+#define LOG_DISABLE_SLAVE (1 << 0)
+#define LOG_DISABLE_SP (1 << 1)
+
+#endif /* LOG_SLOW_INCLUDED */