database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge 10.3 into 10.4

Browse Source
This commit is contained in:
Marko Mäkelä
2022-12-14 06:20:04 +02:00
parent 87eccd78a7 697dbd15e0
commit f97f6955bd
4 changed files with 43 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
mysql-test/main/log_slow.result
View File

@ -64,7 +64,7 @@ rows_affected int(11) NO NULL
flush slow logs; flush slow logs;
set long_query_time=0.1; set long_query_time=0.1;
set log_slow_filter=''; set log_slow_filter='';
set global slow_query_log=1; set slow_query_log=1;
set global log_output='TABLE'; set global log_output='TABLE';
select sleep(0.5); select sleep(0.5);
sleep(0.5) sleep(0.5)
@ -73,7 +73,7 @@ select count(*) FROM mysql.slow_log;
count(*) count(*)
1 1
set @@long_query_time=default; set @@long_query_time=default;
set global slow_query_log= @org_slow_query_log; set @@slow_query_log=default;
set @@log_slow_filter=default; set @@log_slow_filter=default;
set @@log_slow_verbosity=default; set @@log_slow_verbosity=default;
set global log_output= default; set global log_output= default;
@ -115,3 +115,21 @@ Slow_queries_increment
SET log_slow_filter=DEFAULT; SET log_slow_filter=DEFAULT;
SET @@long_query_time=default; SET @@long_query_time=default;
SET GLOBAL slow_query_log= @org_slow_query_log; SET GLOBAL slow_query_log= @org_slow_query_log;
#
# MDEV-21187: log_slow_filter="" logs queries not using indexes
#
flush status;
create table t (id int);
insert into t values (1),(4);
set log_slow_filter='';
select * from t;
id
1
4
show session status like 'Slow_queries';
Variable_name Value
Slow_queries 0
drop table t;
#
# End of 10.3 tests
#

21
mysql-test/main/log_slow.test
View File

@ -50,14 +50,14 @@ flush slow logs;
# MDEV-4206 (empty filter should be no filter) # MDEV-4206 (empty filter should be no filter)
set long_query_time=0.1; set long_query_time=0.1;
set log_slow_filter=''; set log_slow_filter='';
set global slow_query_log=1; set slow_query_log=1;
set global log_output='TABLE'; set global log_output='TABLE';
select sleep(0.5); select sleep(0.5);
select count(*) FROM mysql.slow_log; select count(*) FROM mysql.slow_log;
# Reset used variables # Reset used variables
set @@long_query_time=default; set @@long_query_time=default;
set global slow_query_log= @org_slow_query_log; set @@slow_query_log=default;
set @@log_slow_filter=default; set @@log_slow_filter=default;
set @@log_slow_verbosity=default; set @@log_slow_verbosity=default;
set global log_output= default; set global log_output= default;
@ -102,3 +102,20 @@ SET log_slow_filter=DEFAULT;
SET @@long_query_time=default; SET @@long_query_time=default;
SET GLOBAL slow_query_log= @org_slow_query_log; SET GLOBAL slow_query_log= @org_slow_query_log;
--echo #
--echo # MDEV-21187: log_slow_filter="" logs queries not using indexes
--echo #
flush status;
create table t (id int);
insert into t values (1),(4);
set log_slow_filter='';
select * from t;
show session status like 'Slow_queries';
drop table t;
--echo #
--echo # End of 10.3 tests
--echo #

4
scripts/mysql_install_db.sh
View File

@ -148,7 +148,9 @@ parse_arguments()
--builddir=*) builddir=`parse_arg "$arg"` ;; --builddir=*) builddir=`parse_arg "$arg"` ;;
--srcdir=*) srcdir=`parse_arg "$arg"` ;; --srcdir=*) srcdir=`parse_arg "$arg"` ;;
--ldata=*|--datadir=*|--data=*) ldata=`parse_arg "$arg"` ;; --ldata=*|--datadir=*|--data=*) ldata=`parse_arg "$arg"` ;;
--log-error=*) --log[-_]error=*)
# Keep in the arguments passed to the server
args="$args $arg"
log_error=`parse_arg "$arg"` ;; log_error=`parse_arg "$arg"` ;;
# Note that the user will be passed to mysqld so that it runs # Note that the user will be passed to mysqld so that it runs
# as 'user' (crucial e.g. if log-bin=/some_other_path/ # as 'user' (crucial e.g. if log-bin=/some_other_path/

2
sql/sql_parse.cc
View File

@ -2544,7 +2544,7 @@ void log_slow_statement(THD *thd)
if ((thd->server_status & if ((thd->server_status &
(SERVER_QUERY_NO_INDEX_USED | SERVER_QUERY_NO_GOOD_INDEX_USED)) && (SERVER_QUERY_NO_INDEX_USED | SERVER_QUERY_NO_GOOD_INDEX_USED)) &&
!(thd->query_plan_flags & QPLAN_STATUS) && !(thd->query_plan_flags & QPLAN_STATUS) &&
!slow_filter_masked(thd, QPLAN_NOT_USING_INDEX)) (thd->variables.log_slow_filter & QPLAN_NOT_USING_INDEX))
{ {
thd->query_plan_flags|= QPLAN_NOT_USING_INDEX; thd->query_plan_flags|= QPLAN_NOT_USING_INDEX;
/* We are always logging no index queries if enabled in filter */ /* We are always logging no index queries if enabled in filter */