mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 03:52:35 +01: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.
68 lines
1.8 KiB
Text
68 lines
1.8 KiB
Text
#
|
|
# This test is executed once after each test to check the servers
|
|
# for unexpected warnings found in the servers error log
|
|
#
|
|
# NOTE! mysql-test-run.pl has already done a rough filtering
|
|
# of the file and written any suspicious lines
|
|
# to $error_log.warnings file
|
|
#
|
|
--disable_query_log
|
|
|
|
# Don't write these queries to binlog
|
|
set SQL_LOG_BIN=0;
|
|
|
|
# Do not replicate updates to other galera nodes
|
|
--error 0,1193
|
|
set WSREP_ON=0;
|
|
|
|
# Turn off any debug crashes, allow the variable to be
|
|
# non existent in release builds
|
|
--error 0,1193
|
|
set debug_dbug="";
|
|
|
|
use mtr;
|
|
# Allow this session to read-write even if server is started
|
|
# with --transaction-read-only
|
|
set session transaction read write;
|
|
|
|
create temporary table error_log (
|
|
row int auto_increment primary key,
|
|
suspicious int default 1,
|
|
file_name varchar(255),
|
|
line varchar(1024) default null
|
|
) engine=myisam;
|
|
|
|
# Get the name of servers error log
|
|
let $log_error= $MTR_LOG_ERROR;
|
|
let $log_warning= $log_error.warnings;
|
|
|
|
# Try to load the warnings into a temporary table,
|
|
# it might fail with error saying "The MySQL server is
|
|
# running with the --secure-file-priv" in which case
|
|
# an attempt to load the file using LOAD DATA LOCAL is made
|
|
--error 0,1290
|
|
eval load data infile '$log_warning' into table error_log
|
|
fields terminated by 'xykls37' escaped by ''
|
|
ignore 1 lines
|
|
(line)
|
|
set file_name='$log_error';
|
|
|
|
if ($mysql_errno)
|
|
{
|
|
# Try LOAD DATA LOCAL
|
|
eval load data local infile '$log_warning' into table error_log
|
|
fields terminated by 'xykls37' escaped by ''
|
|
ignore 1 lines
|
|
(line)
|
|
set file_name='$log_error';
|
|
}
|
|
|
|
# Call check_warnings to filter out any warning in
|
|
# the error_log table
|
|
call mtr.check_warnings(@result);
|
|
if (`select @result = 0`){
|
|
skip OK;
|
|
}
|
|
--enable_query_log
|
|
echo ^ Found warnings in $log_error;
|
|
exit;
|