5.5 merge

This commit is contained in:
Sergei Golubchik 2013-03-27 23:41:02 +01:00
commit 993ea79f2d
627 changed files with 17002 additions and 18008 deletions

View file

@ -775,7 +775,7 @@ ulong JOIN_CACHE::get_min_join_buffer_size()
tab= next_linear_tab(join, tab, WITHOUT_BUSH_ROOTS))
{
len+= tab->get_max_used_fieldlength();
len_last=+ tab->get_used_fieldlength();
len_last+= tab->get_used_fieldlength();
}
size_t len_addon= get_record_max_affix_length() +
get_max_key_addon_space_per_record();