diff options
| author | Michael Widenius <monty@askmonty.org> | 2013-05-11 20:31:50 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2013-05-11 20:31:50 +0300 |
| commit | 0737932b907214221bdf1b6fc1eec1d0d98bbfde (patch) | |
| tree | 9e74ec59f5fde9dabadac3a2bf64f8a27082f7c8 /mysql-test/r/log_slow.result | |
| parent | 5b31f8785840d63e6a2516758bcd68ac1307d7a7 (diff) | |
| download | mariadb-git-0737932b907214221bdf1b6fc1eec1d0d98bbfde.tar.gz | |
Fixed that SHOW PROCESSLIST and information_schema.processlist uses the right length for user names.
Fixed some failing tests
mysql-test/mysql-test-run.pl:
Removed warning from mysql-test-run
mysql-test/r/create.result:
Updated result
mysql-test/r/log_slow.result:
Fixed failing test
mysql-test/suite/funcs_1/r/is_columns_is.result:
Updated result
mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result:
Updated result
mysql-test/suite/funcs_1/r/processlist_val_no_prot.result:
Updated result
mysql-test/t/log_slow.test:
Ensure variables are properly reset at end of test
sql/sql_show.cc:
Fixed max length for user names
Diffstat (limited to 'mysql-test/r/log_slow.result')
| -rw-r--r-- | mysql-test/r/log_slow.result | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mysql-test/r/log_slow.result b/mysql-test/r/log_slow.result index 318dfa7568d..89846dc698c 100644 --- a/mysql-test/r/log_slow.result +++ b/mysql-test/r/log_slow.result @@ -13,6 +13,7 @@ log_slow_filter admin,filesort,filesort_on_disk,full_join,full_scan,query_cache, log_slow_queries ON log_slow_rate_limit 1 log_slow_verbosity +set @org_slow_query_log= @@global.slow_query_log; set @@log_slow_filter= "filesort,filesort_on_disk,full_join,full_scan,query_cache,query_cache_miss,tmp_table,tmp_table_on_disk,admin"; select @@log_slow_filter; @@log_slow_filter @@ -68,6 +69,7 @@ count(*) 1 truncate mysql.slow_log; set @@long_query_time=default; -set global slow_query_log=default; +set global slow_query_log= @org_slow_query_log; set @@log_slow_filter=default; set @@log_slow_verbosity=default; +set global log_output= default; |