diff options
| author | Igor Babaev <igor@askmonty.org> | 2010-11-05 19:01:47 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2010-11-05 19:01:47 -0700 |
| commit | 71e48fbf3efab4b324147fdc818600fe45a0fc39 (patch) | |
| tree | d28a54310259e008104761ea1198e5bf659f5042 /sql/set_var.cc | |
| parent | c670b9021e782ead4cdd0d20ead2421367626ea5 (diff) | |
| parent | 4bc81968ab70f91bc212f1a12dce821d09686242 (diff) | |
| download | mariadb-git-71e48fbf3efab4b324147fdc818600fe45a0fc39.tar.gz | |
Merge
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 7e00ae5aa19..3eb095882db 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; |