diff options
author | Sergei Golubchik <serg@mariadb.org> | 2017-09-27 11:07:19 +0200 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2017-10-05 11:45:32 +0200 |
commit | ac57a30bd9e9aec457b5352e5023e736e015e8ca (patch) | |
tree | d588db36cc762c320c8cb8d0019ec50021c6781d | |
parent | 93fb5865729993671de11f21eaa1672696d7a5d2 (diff) | |
download | mariadb-git-ac57a30bd9e9aec457b5352e5023e736e015e8ca.tar.gz |
MDEV-13675 filsort_priority_queue
typo fixed
-rw-r--r-- | mysql-test/r/log_slow.result | 4 | ||||
-rw-r--r-- | mysql-test/r/mysqld--help.result | 4 | ||||
-rw-r--r-- | mysql-test/r/set_statement.result | 2 | ||||
-rw-r--r-- | mysql-test/suite/sys_vars/r/log_queries_not_using_indexes_basic.result | 8 | ||||
-rw-r--r-- | mysql-test/suite/sys_vars/r/log_slow_filter_basic.result | 12 | ||||
-rw-r--r-- | mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result | 8 | ||||
-rw-r--r-- | sql/sys_vars.cc | 2 |
7 files changed, 20 insertions, 20 deletions
diff --git a/mysql-test/r/log_slow.result b/mysql-test/r/log_slow.result index 47b8640c556..59149633b99 100644 --- a/mysql-test/r/log_slow.result +++ b/mysql-test/r/log_slow.result @@ -1,6 +1,6 @@ select @@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; @@log_slow_rate_limit 1 @@ -11,7 +11,7 @@ show variables like "log_slow%"; Variable_name Value log_slow_admin_statements ON 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_slave_statements ON log_slow_verbosity diff --git a/mysql-test/r/mysqld--help.result b/mysql-test/r/mysqld--help.result index 59b7da53dbc..13f7507d4cb 100644 --- a/mysql-test/r/mysqld--help.result +++ b/mysql-test/r/mysqld--help.result @@ -452,7 +452,7 @@ The following options may be given as the first argument: types are bound by slow_query_time, except 'not_using_index' which is always logged if enabled. Any 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, tmp_table_on_disk --log-slow-rate-limit=# @@ -1388,7 +1388,7 @@ log-short-format FALSE log-slave-updates FALSE log-slow-admin-statements TRUE 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-slave-statements TRUE log-slow-verbosity diff --git a/mysql-test/r/set_statement.result b/mysql-test/r/set_statement.result index 11d8c6f931f..5bcf8252aae 100644 --- a/mysql-test/r/set_statement.result +++ b/mysql-test/r/set_statement.result @@ -1047,7 +1047,7 @@ set statement long_query_time=default for select @@long_query_time; 10.000000 set statement log_slow_filter=default for select @@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; @@log_slow_verbosity diff --git a/mysql-test/suite/sys_vars/r/log_queries_not_using_indexes_basic.result b/mysql-test/suite/sys_vars/r/log_queries_not_using_indexes_basic.result index 8952caac8b0..ce0ebb62b46 100644 --- a/mysql-test/suite/sys_vars/r/log_queries_not_using_indexes_basic.result +++ b/mysql-test/suite/sys_vars/r/log_queries_not_using_indexes_basic.result @@ -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; select @@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; select @@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; select @@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; select @@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=""; select @@SESSION.log_queries_not_using_indexes; @@SESSION.log_queries_not_using_indexes diff --git a/mysql-test/suite/sys_vars/r/log_slow_filter_basic.result b/mysql-test/suite/sys_vars/r/log_slow_filter_basic.result index 0d2549bdbf1..93558fb6dd9 100644 --- a/mysql-test/suite/sys_vars/r/log_slow_filter_basic.result +++ b/mysql-test/suite/sys_vars/r/log_slow_filter_basic.result @@ -1,22 +1,22 @@ SET @start_global_value = @@global.log_slow_filter; select @@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; @@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'; 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'; 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'; 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'; 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; select @@global.log_slow_filter; @@global.log_slow_filter diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result index a370d9cdfbe..5dcefb3ffe2 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result +++ b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result @@ -2027,17 +2027,17 @@ ENUM_VALUE_LIST admin,call,slave,sp READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED 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 -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 +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,filesort_priority_queue,full_join,full_scan,query_cache,query_cache_miss,tmp_table,tmp_table_on_disk 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_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 NUMERIC_MIN_VALUE NULL NUMERIC_MAX_VALUE 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 COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME LOG_SLOW_RATE_LIMIT diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index d16ae7f85a3..daf13ee56f9 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -5379,7 +5379,7 @@ static Sys_var_keycache Sys_key_cache_segments( 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", "query_cache_miss", "tmp_table", "tmp_table_on_disk", 0 }; |