From 67e8e926e98ac98fd3788c112482d2b850d2739f Mon Sep 17 00:00:00 2001 From: Michael Widenius Date: Tue, 11 Feb 2014 16:56:38 +0200 Subject: [PATCH] Set default progress report time to 5 seconds (Had accidently been set to 56 seconds in some merge) sql/sys_vars.cc: Set default progress report time to 5 seconds --- mysql-test/r/mysqld--help.result | 2 +- .../sys_vars/r/progress_report_time_basic.result | 12 ++++++------ sql/sys_vars.cc | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/mysql-test/r/mysqld--help.result b/mysql-test/r/mysqld--help.result index 16da8eae7f9..10e297bafb6 100644 --- a/mysql-test/r/mysqld--help.result +++ b/mysql-test/r/mysqld--help.result @@ -1029,7 +1029,7 @@ port 3306 port-open-timeout 0 preload-buffer-size 32768 profiling-history-size 15 -progress-report-time 56 +progress-report-time 5 query-alloc-block-size 8192 query-cache-limit 1048576 query-cache-min-res-unit 4096 diff --git a/mysql-test/suite/sys_vars/r/progress_report_time_basic.result b/mysql-test/suite/sys_vars/r/progress_report_time_basic.result index 7aab917b4f8..b8e8c39f451 100644 --- a/mysql-test/suite/sys_vars/r/progress_report_time_basic.result +++ b/mysql-test/suite/sys_vars/r/progress_report_time_basic.result @@ -1,22 +1,22 @@ SET @start_global_value = @@global.progress_report_time; select @@global.progress_report_time; @@global.progress_report_time -56 +5 select @@session.progress_report_time; @@session.progress_report_time -56 +5 show global variables like 'progress_report_time'; Variable_name Value -progress_report_time 56 +progress_report_time 5 show session variables like 'progress_report_time'; Variable_name Value -progress_report_time 56 +progress_report_time 5 select * from information_schema.global_variables where variable_name='progress_report_time'; VARIABLE_NAME VARIABLE_VALUE -PROGRESS_REPORT_TIME 56 +PROGRESS_REPORT_TIME 5 select * from information_schema.session_variables where variable_name='progress_report_time'; VARIABLE_NAME VARIABLE_VALUE -PROGRESS_REPORT_TIME 56 +PROGRESS_REPORT_TIME 5 set global progress_report_time=10; select @@global.progress_report_time; @@global.progress_report_time diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index 49b90006000..d82c8f30ed2 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -3833,7 +3833,7 @@ static Sys_var_ulong Sys_progress_report_time( "Seconds between sending progress reports to the client for " "time-consuming statements. Set to 0 to disable progress reporting.", SESSION_VAR(progress_report_time), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(0, UINT_MAX), DEFAULT(56), BLOCK_SIZE(1)); + VALID_RANGE(0, UINT_MAX), DEFAULT(5), BLOCK_SIZE(1)); static Sys_var_mybool Sys_no_thread_alarm( "debug_no_thread_alarm",