summaryrefslogtreecommitdiff
path: root/sql/sys_vars.cc
diff options
context:
space:
mode:
authorNirbhay Choubey <nirbhay@skysql.com>2014-02-25 17:49:41 -0500
committerNirbhay Choubey <nirbhay@skysql.com>2014-02-25 17:49:41 -0500
commitae6e1548cbda6cb1509f84edb57786c9520a7a6e (patch)
tree1e077c56860cfa1149e85117a2a2311d901c0d1c /sql/sys_vars.cc
parente36fe045c03038b3bc2d9d21b4bbce66077985f5 (diff)
parentff2e82f4a175b7b023cd167b2fa6e6fcd1bd192e (diff)
downloadmariadb-git-ae6e1548cbda6cb1509f84edb57786c9520a7a6e.tar.gz
Merge from maria/5.5 (-rtag:mariadb-5.5.36).
Diffstat (limited to 'sql/sys_vars.cc')
-rw-r--r--sql/sys_vars.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc
index 96276a1b896..30833588e06 100644
--- a/sql/sys_vars.cc
+++ b/sql/sys_vars.cc
@@ -4093,7 +4093,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",