diff options
| author | Igor Babaev <igor@askmonty.org> | 2010-10-27 16:31:22 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2010-10-27 16:31:22 -0700 |
| commit | 4f75a8254a3d65df031f4a3ea7ad44bb07917280 (patch) | |
| tree | 40d6e05a135292981e2f3ce6246db2a7170c30cf /sql/set_var.cc | |
| parent | 851b2c3a025722101c7a0823dd03ff259196388c (diff) | |
| parent | 0c53cd1ec9cbc50daf5b8d7c9f11e10f4d1fe564 (diff) | |
| download | mariadb-git-4f75a8254a3d65df031f4a3ea7ad44bb07917280.tar.gz | |
Merge 5.3-mwl128 -> 5.3
Diffstat (limited to 'sql/set_var.cc')
| -rw-r--r-- | sql/set_var.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index 0eaa450d09c..69f6ebfadc1 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -318,6 +318,9 @@ static sys_var_thd_ulong sys_interactive_timeout(&vars, "interactive_timeout", &SV::net_interactive_timeout); static sys_var_thd_ulong sys_join_buffer_size(&vars, "join_buffer_size", &SV::join_buff_size); +static sys_var_thd_ulonglong sys_join_buffer_space_limit(&vars, + "join_buffer_space_limit", + &SV::join_buff_space_limit); static sys_var_thd_ulong sys_join_cache_level(&vars, "join_cache_level", &SV::join_cache_level); static sys_var_key_buffer_size sys_key_buffer_size(&vars, "key_buffer_size"); @@ -4052,7 +4055,7 @@ bool sys_var_thd_optimizer_switch:: symbolic_mode_representation(THD *thd, ulonglong val, LEX_STRING *rep) { - char buff[STRING_BUFFER_USUAL_SIZE*8]; + char buff[STRING_BUFFER_USUAL_SIZE*18]; String tmp(buff, sizeof(buff), &my_charset_latin1); int i; ulonglong bit; |