diff options
author | Monty <monty@mariadb.org> | 2019-09-02 14:06:56 +0300 |
---|---|---|
committer | Monty <monty@mariadb.org> | 2019-09-03 13:17:32 +0300 |
commit | a071e0e029cd7c155cff1054d9f7f8a6aa898620 (patch) | |
tree | b592c10cb8ca3036688ea19039208eadd485fe7c /mysql-test/main/set_statement.result | |
parent | b0ff5a6a7393c057cd201aff63279e45d3e0cc49 (diff) | |
parent | 9cba6c5aa3b15fffc0ca10e92bcb55a126a20701 (diff) | |
download | mariadb-git-a071e0e029cd7c155cff1054d9f7f8a6aa898620.tar.gz |
Merge branch '10.2' into 10.3
Diffstat (limited to 'mysql-test/main/set_statement.result')
-rw-r--r-- | mysql-test/main/set_statement.result | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/mysql-test/main/set_statement.result b/mysql-test/main/set_statement.result index c34e1171899..48675145fd2 100644 --- a/mysql-test/main/set_statement.result +++ b/mysql-test/main/set_statement.result @@ -1044,19 +1044,11 @@ set @save_slow_query_log= @@slow_query_log; set @save_log_output= @@log_output; set statement long_query_time=default for select @@long_query_time; @@long_query_time -10.000000 +DEFAULT set statement log_slow_filter=default for select @@log_slow_filter; -@@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 statement log_slow_verbosity=default for select @@log_slow_verbosity; -@@log_slow_verbosity - set statement log_slow_rate_limit=default for select @@log_slow_rate_limit; -@@log_slow_rate_limit -1 set statement slow_query_log=default for select @@slow_query_log; -@@slow_query_log -1 truncate table mysql.slow_log; set slow_query_log= 1; set global log_output='TABLE'; |