mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
cd3047fc89
Added (rewritten) patch from Percona to get extended statistics in slow.log: - Added handling of 'set' variables to set_var.cc. Changed sql_mode to use this - Added extra logging to slow log of 'Thread_id, Schema, Query Cache hit, Rows sent and Rows examined' - Added optional logging to slow log, through log_slow_verbosity, of query plan statistics - Added new user variables log_slow_rate_limit, log_slow_verbosity, log_slow_filter - Added log-slow-file as synonym for 'slow-log-file', as most slow-log variables starts with 'log-slow' - Added log-slow-time as synonym for long-query-time Some trivial MyISAM optimizations: - In prepare for drop, flush key blocks - Don't call mi_lock_database if my_disable_locking is used KNOWN_BUGS.txt: Updated file to reflect MariaDB and not the Maria storage engine README: Updated file to reflect MariaDB mysql-test/r/log_slow.result: Test new options for slow query log mysql-test/r/variables.result: Updated result (old version cut of things at 79 characters) mysql-test/t/log_slow.test: Test new options for slow query log sql/Makefile.am: Added log_slow.h sql/event_data_objects.cc: Removed not needed test for enable_slow_log (is done when the flag is tested elsewhere) sql/events.cc: Use the general make_set() function instead of 'symbolic_mode_representation' sql/filesort.cc: Added status for used query plans sql/log.cc: Reset counters if no query_length (from Percona's patch; Not sure if needed, but can do no harm) Added extra logging to slow log of 'Thread_id, Schema, Query Cache hit, Rows sent and Rows examined' Added optional logging to slow log, through log_slow_verbosity, of query plan statistics Fixed wrong test of error condition sql/log_slow.h: Defines and variables for log_slow_verbosity and log_slow_filter sql/mysql_priv.h: Include log_slow.h sql/mysqld.cc: Added new user variables log_slow_rate_limit, log_slow_verbosity, log_slow_filter Added log-slow-file as synonym for 'slow-log-file', as most slow-log variables starts with 'log-slow' Added log-slow-time as synonym for long-query-time Added note that one should use log-slow-filter instead of log-slow-admin-statements Updated comment from 'slow_query_log_file' sql/set_var.cc: Added long_slow_time as synonym for long_query_time Added new user variables log_slow_rate_limit, log_slow_verbosity, log_slow_filter dded handling of 'set' variables to set_var.cc. Changed sql_mode to use this sql/set_var.h: - Added handling of 'set' variables. Changed sql_mode to use this sql/slave.cc: Use global filter also for slaves sql/sp_head.cc: Simplify saving of general_slow_log state Use the general make_set() function instead of 'symbolic_mode_representation' sql/sql_cache.cc: Added status for used query plans sql/sql_class.cc: Remember/restore query_plan_flags over complex statements sql/sql_class.h: Added variables to handle extended slow log statistics sql/sql_parse.cc: Added status for used query plans Added test for filtering slow_query_log sql/sql_select.cc: Added status for used query plans sql/sql_show.cc: Use the general make_set() function instead of 'symbolic_mode_representation' sql/strfunc.cc: Report first error (not last) if something is wrong in a set Removed compiler warning storage/myisam/mi_extra.c: In prepare for drop, flush key blocks (speed optimization) storage/myisam/mi_locking.c: Don't call mi_lock_database if my_disable_locking is used (speed optimization)
107 lines
3.1 KiB
C
107 lines
3.1 KiB
C
/* Copyright (C) 2009 Monty Program Ab
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; version 2 or later of the License.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
/* Defining what to log to slow log */
|
|
|
|
#define LOG_SLOW_VERBOSITY_INIT 0
|
|
#define LOG_SLOW_VERBOSITY_INNODB 1 << 0
|
|
#define LOG_SLOW_VERBOSITY_QUERY_PLAN 1 << 1
|
|
|
|
#ifdef DEFINE_VARIABLES_LOG_SLOW
|
|
|
|
/* Names here must be in same order as the bit's above */
|
|
static const char *log_slow_verbosity_names[]=
|
|
{
|
|
"innodb","query_plan",
|
|
NullS
|
|
};
|
|
|
|
static const unsigned int log_slow_verbosity_names_len[]=
|
|
{
|
|
sizeof("innodb") -1,
|
|
sizeof("query_plan")-1
|
|
};
|
|
|
|
TYPELIB log_slow_verbosity_typelib=
|
|
{ array_elements(log_slow_verbosity_names)-1,"", log_slow_verbosity_names,
|
|
(unsigned int *) log_slow_verbosity_names_len };
|
|
|
|
#else
|
|
extern TYPELIB log_slow_verbosity_typelib;
|
|
#endif /* DEFINE_VARIABLES_LOG_SLOW */
|
|
|
|
/* Defines for what kind of query plan was used and what to log */
|
|
|
|
/*
|
|
We init the used query plan with a bit that is alwyas set and all 'no' bits
|
|
to enable easy testing of what to log in sql_log.cc
|
|
*/
|
|
#define QPLAN_INIT (QPLAN_ALWAYS_SET | QPLAN_QC_NO)
|
|
|
|
#define QPLAN_ADMIN 1 << 0
|
|
#define QPLAN_FILESORT 1 << 1
|
|
#define QPLAN_FILESORT_DISK 1 << 2
|
|
#define QPLAN_FULL_JOIN 1 << 3
|
|
#define QPLAN_FULL_SCAN 1 << 4
|
|
#define QPLAN_QC 1 << 5
|
|
#define QPLAN_QC_NO 1 << 6
|
|
#define QPLAN_TMP_DISK 1 << 7
|
|
#define QPLAN_TMP_TABLE 1 << 8
|
|
/* ... */
|
|
#define QPLAN_MAX ((ulong) 1) << 31 /* reserved as placeholder */
|
|
#define QPLAN_ALWAYS_SET QPLAN_MAX
|
|
#define QPLAN_VISIBLE_MASK (~(QPLAN_ALWAYS_SET))
|
|
|
|
#ifdef DEFINE_VARIABLES_LOG_SLOW
|
|
/* Names here must be in same order as the bit's above */
|
|
static const char *log_slow_filter_names[]=
|
|
{
|
|
"admin",
|
|
"filesort",
|
|
"filesort_on_disk",
|
|
"full_join",
|
|
"full_scan",
|
|
"query_cache",
|
|
"query_cache_miss",
|
|
"tmp_table",
|
|
"tmp_table_on_disk",
|
|
NullS
|
|
};
|
|
|
|
static const unsigned int log_slow_filter_names_len[]=
|
|
{
|
|
sizeof("admin")-1,
|
|
sizeof("filesort")-1,
|
|
sizeof("filesort_on_disk")-1,
|
|
sizeof("full_join")-1,
|
|
sizeof("full_scan")-1,
|
|
sizeof("query_cache")-1,
|
|
sizeof("query_cache_miss")-1,
|
|
sizeof("tmp_table")-1,
|
|
sizeof("tmp_table_on_disk")-1
|
|
};
|
|
|
|
TYPELIB log_slow_filter_typelib=
|
|
{ array_elements(log_slow_filter_names)-1,"", log_slow_filter_names,
|
|
(unsigned int *) log_slow_filter_names_len };
|
|
|
|
#else
|
|
extern TYPELIB log_slow_filter_typelib;
|
|
#endif /* DEFINE_VARIABLES_LOG_SLOW */
|
|
|
|
static inline ulong fix_log_slow_filter(ulong org_filter)
|
|
{
|
|
return org_filter ? org_filter : QPLAN_ALWAYS_SET;
|
|
}
|