mirror of
https://github.com/MariaDB/server.git
synced 2025-05-08 15:01:49 +03:00
21518ab2e4
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.
62 lines
1.7 KiB
Plaintext
62 lines
1.7 KiB
Plaintext
SET @old_log_output= @@global.log_output;
|
|
SET @old_log_disable_statements= @@global.log_disabled_statements;
|
|
|
|
|
|
CREATE TABLE t1 (i INT PRIMARY KEY AUTO_INCREMENT, j VARCHAR(255) ) ENGINE=MyISAM;
|
|
insert into t1 (j) values ('a'),('b'),('c'),('d');
|
|
|
|
# enable slow logging to table
|
|
SET GLOBAL log_output = 'file,table';
|
|
|
|
DELIMITER $;
|
|
CREATE PROCEDURE slow()
|
|
BEGIN
|
|
SELECT count(if(sleep(1) >= 0,0,NULL)) from t1 where j>'b';
|
|
SELECT count(*) from t1 where j>'a';
|
|
END
|
|
$
|
|
|
|
DELIMITER ;$
|
|
|
|
select @@log_disabled_statements;
|
|
TRUNCATE TABLE mysql.general_log;
|
|
check table t1;
|
|
CALL slow();
|
|
SELECT count(if(sleep(1) >= 0,0,NULL)) from t1 where j>'b and part2';
|
|
|
|
--echo -->
|
|
SELECT argument FROM mysql.general_log where command_type <> "Close stmt" and command_type <> "Prepare" and argument not like "%general_log%";
|
|
--echo <--
|
|
|
|
TRUNCATE TABLE mysql.general_log;
|
|
SET SESSION log_disabled_statements="";
|
|
check table t1;
|
|
CALL slow();
|
|
SELECT count(if(sleep(1) >= 0,0,NULL)) from t1 where j>'b and part3';
|
|
|
|
--echo -->
|
|
SELECT argument FROM mysql.general_log where command_type <> "Close stmt" and command_type <> "Prepare" and argument not like "%general_log%";
|
|
--echo <--
|
|
|
|
TRUNCATE TABLE mysql.general_log;
|
|
SET SESSION log_disabled_statements="sp,slave";
|
|
check table t1;
|
|
CALL slow();
|
|
SELECT count(if(sleep(1) >= 0,0,NULL)) from t1 where j>'b and part4';
|
|
|
|
--echo -->
|
|
SELECT argument FROM mysql.general_log where command_type <> "Close stmt" and command_type <> "Prepare" and argument not like "%general_log%";
|
|
--echo <--
|
|
|
|
DROP TABLE t1;
|
|
DROP PROCEDURE slow;
|
|
|
|
#
|
|
# Restore setup
|
|
#
|
|
TRUNCATE TABLE mysql.general_log;
|
|
SET @@global.log_output= @old_log_output;
|
|
SET @@global.log_disabled_statements= @old_log_disable_statements;
|
|
|
|
|