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

MDEV-13675 filsort_priority_queue

Browse Source 
typo fixed
This commit is contained in:
Sergei Golubchik
2017-09-27 11:07:19 +02:00
parent 93fb586572
commit ac57a30bd9
7 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/r/log_slow.result
View File

@ -1,6 +1,6 @@
select @@log_slow_filter; select @@log_slow_filter;
@@log_slow_filter @@log_slow_filter
admin,filesort,filesort_on_disk,filsort_priority_queue,full_join,full_scan,query_cache,query_cache_miss,tmp_table,tmp_table_on_disk admin,filesort,filesort_on_disk,filesort_priority_queue,full_join,full_scan,query_cache,query_cache_miss,tmp_table,tmp_table_on_disk
select @@log_slow_rate_limit; select @@log_slow_rate_limit;
@@log_slow_rate_limit @@log_slow_rate_limit
1 1
@ -11,7 +11,7 @@ show variables like "log_slow%";
Variable_name Value Variable_name Value
log_slow_admin_statements ON log_slow_admin_statements ON
log_slow_disabled_statements sp log_slow_disabled_statements sp
log_slow_filter admin,filesort,filesort_on_disk,filsort_priority_queue,full_join,full_scan,query_cache,query_cache_miss,tmp_table,tmp_table_on_disk log_slow_filter admin,filesort,filesort_on_disk,filesort_priority_queue,full_join,full_scan,query_cache,query_cache_miss,tmp_table,tmp_table_on_disk
log_slow_rate_limit 1 log_slow_rate_limit 1
log_slow_slave_statements ON log_slow_slave_statements ON
log_slow_verbosity log_slow_verbosity

4
mysql-test/r/mysqld--help.result
View File

@ -452,7 +452,7 @@ The following options may be given as the first argument:
types are bound by slow_query_time, except types are bound by slow_query_time, except
'not_using_index' which is always logged if enabled. Any 'not_using_index' which is always logged if enabled. Any
combination of: admin, filesort, filesort_on_disk, combination of: admin, filesort, filesort_on_disk,
filsort_priority_queue, full_join, full_scan, filesort_priority_queue, full_join, full_scan,
not_using_index, query_cache, query_cache_miss, tmp_table, not_using_index, query_cache, query_cache_miss, tmp_table,
tmp_table_on_disk tmp_table_on_disk
--log-slow-rate-limit=# --log-slow-rate-limit=#
@ -1388,7 +1388,7 @@ log-short-format FALSE
log-slave-updates FALSE log-slave-updates FALSE
log-slow-admin-statements TRUE log-slow-admin-statements TRUE
log-slow-disabled-statements sp log-slow-disabled-statements sp
log-slow-filter admin,filesort,filesort_on_disk,filsort_priority_queue,full_join,full_scan,query_cache,query_cache_miss,tmp_table,tmp_table_on_disk log-slow-filter admin,filesort,filesort_on_disk,filesort_priority_queue,full_join,full_scan,query_cache,query_cache_miss,tmp_table,tmp_table_on_disk
log-slow-rate-limit 1 log-slow-rate-limit 1
log-slow-slave-statements TRUE log-slow-slave-statements TRUE
log-slow-verbosity log-slow-verbosity

2
mysql-test/r/set_statement.result
View File

@ -1047,7 +1047,7 @@ set statement long_query_time=default for select @@long_query_time;
10.000000 10.000000
set statement log_slow_filter=default for select @@log_slow_filter; set statement log_slow_filter=default for select @@log_slow_filter;
@@log_slow_filter @@log_slow_filter
admin,filesort,filesort_on_disk,filsort_priority_queue,full_join,full_scan,query_cache,query_cache_miss,tmp_table,tmp_table_on_disk admin,filesort,filesort_on_disk,filesort_priority_queue,full_join,full_scan,query_cache,query_cache_miss,tmp_table,tmp_table_on_disk
set statement log_slow_verbosity=default for select @@log_slow_verbosity; set statement log_slow_verbosity=default for select @@log_slow_verbosity;
@@log_slow_verbosity @@log_slow_verbosity

8
mysql-test/suite/sys_vars/r/log_queries_not_using_indexes_basic.result
View File

@ -73,19 +73,19 @@ ERROR 42000: You have an error in your SQL syntax; check the manual that corresp
SET @@SESSION.log_queries_not_using_indexes= TRUE; SET @@SESSION.log_queries_not_using_indexes= TRUE;
select @@SESSION.log_slow_filter; select @@SESSION.log_slow_filter;
@@SESSION.log_slow_filter @@SESSION.log_slow_filter
admin,filesort,filesort_on_disk,filsort_priority_queue,full_join,full_scan,not_using_index,query_cache,query_cache_miss,tmp_table,tmp_table_on_disk admin,filesort,filesort_on_disk,filesort_priority_queue,full_join,full_scan,not_using_index,query_cache,query_cache_miss,tmp_table,tmp_table_on_disk
SET @@SESSION.log_queries_not_using_indexes= FALSE; SET @@SESSION.log_queries_not_using_indexes= FALSE;
select @@SESSION.log_slow_filter; select @@SESSION.log_slow_filter;
@@SESSION.log_slow_filter @@SESSION.log_slow_filter
admin,filesort,filesort_on_disk,filsort_priority_queue,full_join,full_scan,query_cache,query_cache_miss,tmp_table,tmp_table_on_disk admin,filesort,filesort_on_disk,filesort_priority_queue,full_join,full_scan,query_cache,query_cache_miss,tmp_table,tmp_table_on_disk
SET @@GLOBAL.log_queries_not_using_indexes= TRUE; SET @@GLOBAL.log_queries_not_using_indexes= TRUE;
select @@GLOBAL.log_slow_filter; select @@GLOBAL.log_slow_filter;
@@GLOBAL.log_slow_filter @@GLOBAL.log_slow_filter
admin,filesort,filesort_on_disk,filsort_priority_queue,full_join,full_scan,not_using_index,query_cache,query_cache_miss,tmp_table,tmp_table_on_disk admin,filesort,filesort_on_disk,filesort_priority_queue,full_join,full_scan,not_using_index,query_cache,query_cache_miss,tmp_table,tmp_table_on_disk
SET @@GLOBAL.log_queries_not_using_indexes= FALSE; SET @@GLOBAL.log_queries_not_using_indexes= FALSE;
select @@GLOBAL.log_slow_filter; select @@GLOBAL.log_slow_filter;
@@GLOBAL.log_slow_filter @@GLOBAL.log_slow_filter
admin,filesort,filesort_on_disk,filsort_priority_queue,full_join,full_scan,query_cache,query_cache_miss,tmp_table,tmp_table_on_disk admin,filesort,filesort_on_disk,filesort_priority_queue,full_join,full_scan,query_cache,query_cache_miss,tmp_table,tmp_table_on_disk
SET @@SESSION.log_slow_filter=""; SET @@SESSION.log_slow_filter="";
select @@SESSION.log_queries_not_using_indexes; select @@SESSION.log_queries_not_using_indexes;
@@SESSION.log_queries_not_using_indexes @@SESSION.log_queries_not_using_indexes

12
mysql-test/suite/sys_vars/r/log_slow_filter_basic.result
View File

@ -1,22 +1,22 @@
SET @start_global_value = @@global.log_slow_filter; SET @start_global_value = @@global.log_slow_filter;
select @@global.log_slow_filter; select @@global.log_slow_filter;
@@global.log_slow_filter @@global.log_slow_filter
admin,filesort,filesort_on_disk,filsort_priority_queue,full_join,full_scan,query_cache,query_cache_miss,tmp_table,tmp_table_on_disk admin,filesort,filesort_on_disk,filesort_priority_queue,full_join,full_scan,query_cache,query_cache_miss,tmp_table,tmp_table_on_disk
select @@session.log_slow_filter; select @@session.log_slow_filter;
@@session.log_slow_filter @@session.log_slow_filter
admin,filesort,filesort_on_disk,filsort_priority_queue,full_join,full_scan,query_cache,query_cache_miss,tmp_table,tmp_table_on_disk admin,filesort,filesort_on_disk,filesort_priority_queue,full_join,full_scan,query_cache,query_cache_miss,tmp_table,tmp_table_on_disk
show global variables like 'log_slow_filter'; show global variables like 'log_slow_filter';
Variable_name Value Variable_name Value
log_slow_filter admin,filesort,filesort_on_disk,filsort_priority_queue,full_join,full_scan,query_cache,query_cache_miss,tmp_table,tmp_table_on_disk log_slow_filter admin,filesort,filesort_on_disk,filesort_priority_queue,full_join,full_scan,query_cache,query_cache_miss,tmp_table,tmp_table_on_disk
show session variables like 'log_slow_filter'; show session variables like 'log_slow_filter';
Variable_name Value Variable_name Value
log_slow_filter admin,filesort,filesort_on_disk,filsort_priority_queue,full_join,full_scan,query_cache,query_cache_miss,tmp_table,tmp_table_on_disk log_slow_filter admin,filesort,filesort_on_disk,filesort_priority_queue,full_join,full_scan,query_cache,query_cache_miss,tmp_table,tmp_table_on_disk
select * from information_schema.global_variables where variable_name='log_slow_filter'; select * from information_schema.global_variables where variable_name='log_slow_filter';
VARIABLE_NAME VARIABLE_VALUE VARIABLE_NAME VARIABLE_VALUE
LOG_SLOW_FILTER admin,filesort,filesort_on_disk,filsort_priority_queue,full_join,full_scan,query_cache,query_cache_miss,tmp_table,tmp_table_on_disk LOG_SLOW_FILTER admin,filesort,filesort_on_disk,filesort_priority_queue,full_join,full_scan,query_cache,query_cache_miss,tmp_table,tmp_table_on_disk
select * from information_schema.session_variables where variable_name='log_slow_filter'; select * from information_schema.session_variables where variable_name='log_slow_filter';
VARIABLE_NAME VARIABLE_VALUE VARIABLE_NAME VARIABLE_VALUE
LOG_SLOW_FILTER admin,filesort,filesort_on_disk,filsort_priority_queue,full_join,full_scan,query_cache,query_cache_miss,tmp_table,tmp_table_on_disk LOG_SLOW_FILTER admin,filesort,filesort_on_disk,filesort_priority_queue,full_join,full_scan,query_cache,query_cache_miss,tmp_table,tmp_table_on_disk
set global log_slow_filter=1; set global log_slow_filter=1;
select @@global.log_slow_filter; select @@global.log_slow_filter;
@@global.log_slow_filter @@global.log_slow_filter

8
mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result
View File

@ -2027,17 +2027,17 @@ ENUM_VALUE_LIST admin,call,slave,sp
READ_ONLY NO READ_ONLY NO
COMMAND_LINE_ARGUMENT REQUIRED COMMAND_LINE_ARGUMENT REQUIRED
VARIABLE_NAME LOG_SLOW_FILTER VARIABLE_NAME LOG_SLOW_FILTER
SESSION_VALUE admin,filesort,filesort_on_disk,filsort_priority_queue,full_join,full_scan,query_cache,query_cache_miss,tmp_table,tmp_table_on_disk SESSION_VALUE admin,filesort,filesort_on_disk,filesort_priority_queue,full_join,full_scan,query_cache,query_cache_miss,tmp_table,tmp_table_on_disk
GLOBAL_VALUE admin,filesort,filesort_on_disk,filsort_priority_queue,full_join,full_scan,query_cache,query_cache_miss,tmp_table,tmp_table_on_disk GLOBAL_VALUE admin,filesort,filesort_on_disk,filesort_priority_queue,full_join,full_scan,query_cache,query_cache_miss,tmp_table,tmp_table_on_disk
GLOBAL_VALUE_ORIGIN COMPILE-TIME GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE admin,filesort,filesort_on_disk,filsort_priority_queue,full_join,full_scan,query_cache,query_cache_miss,tmp_table,tmp_table_on_disk DEFAULT_VALUE admin,filesort,filesort_on_disk,filesort_priority_queue,full_join,full_scan,query_cache,query_cache_miss,tmp_table,tmp_table_on_disk
VARIABLE_SCOPE SESSION VARIABLE_SCOPE SESSION
VARIABLE_TYPE SET VARIABLE_TYPE SET
VARIABLE_COMMENT Log only certain types of queries to the slow log. If variable empty alll kind of queries are logged. All types are bound by slow_query_time, except 'not_using_index' which is always logged if enabled VARIABLE_COMMENT Log only certain types of queries to the slow log. If variable empty alll kind of queries are logged. All types are bound by slow_query_time, except 'not_using_index' which is always logged if enabled
NUMERIC_MIN_VALUE NULL NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL NUMERIC_MAX_VALUE NULL
NUMERIC_BLOCK_SIZE NULL NUMERIC_BLOCK_SIZE NULL
ENUM_VALUE_LIST admin,filesort,filesort_on_disk,filsort_priority_queue,full_join,full_scan,not_using_index,query_cache,query_cache_miss,tmp_table,tmp_table_on_disk ENUM_VALUE_LIST admin,filesort,filesort_on_disk,filesort_priority_queue,full_join,full_scan,not_using_index,query_cache,query_cache_miss,tmp_table,tmp_table_on_disk
READ_ONLY NO READ_ONLY NO
COMMAND_LINE_ARGUMENT REQUIRED COMMAND_LINE_ARGUMENT REQUIRED
VARIABLE_NAME LOG_SLOW_RATE_LIMIT VARIABLE_NAME LOG_SLOW_RATE_LIMIT

2
sql/sys_vars.cc
View File

@ -5379,7 +5379,7 @@ static Sys_var_keycache Sys_key_cache_segments(
static const char *log_slow_filter_names[]= static const char *log_slow_filter_names[]=
{ {
"admin", "filesort", "filesort_on_disk", "filsort_priority_queue", "admin", "filesort", "filesort_on_disk", "filesort_priority_queue",
"full_join", "full_scan", "not_using_index", "query_cache", "full_join", "full_scan", "not_using_index", "query_cache",
"query_cache_miss", "tmp_table", "tmp_table_on_disk", 0 "query_cache_miss", "tmp_table", "tmp_table_on_disk", 0
}; };