summaryrefslogtreecommitdiff
path: root/sql/sql_join_cache.cc
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2013-03-10 12:46:56 +0100
committerSergei Golubchik <sergii@pisem.net>2013-03-10 12:46:56 +0100
commit8dad7dfa6ae40e54e814d3ba135f45bff0c13e8f (patch)
tree0432ab82e496017306a155eeb530ff5f2e184c4e /sql/sql_join_cache.cc
parent9d8ee74b38c5db13dc4466e76b7ad2eb8ce36a5a (diff)
parent926b0f54c9b0f261460e886969dde9bbf1916852 (diff)
downloadmariadb-git-8dad7dfa6ae40e54e814d3ba135f45bff0c13e8f.tar.gz
5.3->5.5 merge
Diffstat (limited to 'sql/sql_join_cache.cc')
-rw-r--r--sql/sql_join_cache.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_join_cache.cc b/sql/sql_join_cache.cc
index 8424dd00d93..e97f0e185c6 100644
--- a/sql/sql_join_cache.cc
+++ b/sql/sql_join_cache.cc
@@ -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();