mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-15 19:37:16 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge 10.3 into 10.4

Browse source
This commit is contained in:
Marko Mäkelä 2019-03-07 08:02:33 +02:00
commit aa4b2c1509
15 changed files with 90 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

4
mysql-test/main/log_slow.result
View file

@ -95,7 +95,7 @@ INFORMATION_SCHEMA.GLOBAL_STATUS
WHERE
VARIABLE_NAME='SLOW_QUERIES';
Slow_queries_increment
0
1
# Although this query is disallowed by log_slow_filter, it should still increment Slow_queries
SET log_slow_filter=filesort;
SELECT sleep(0.2) INTO @tmp FROM DUAL;
@ -110,7 +110,7 @@ INFORMATION_SCHEMA.GLOBAL_STATUS
WHERE
VARIABLE_NAME='SLOW_QUERIES';
Slow_queries_increment
0
1
SET log_slow_filter=DEFAULT;
SET @@long_query_time=default;
SET GLOBAL slow_query_log= @org_slow_query_log;