summaryrefslogtreecommitdiff
path: root/sql/sql_expression_cache.cc
diff options
context:
space:
mode:
authorSergey Petrunya <psergey@askmonty.org>2013-07-16 09:22:17 +0400
committerSergey Petrunya <psergey@askmonty.org>2013-07-16 09:22:17 +0400
commit9651a6f5745c330111b5281e69a7d52fc8261d0d (patch)
tree57fdb29f4035a0a1c4edc155f97577f645e29796 /sql/sql_expression_cache.cc
parent716a49a19e9a6fdd86f384917c8fdd6fdd0dd53f (diff)
downloadmariadb-git-9651a6f5745c330111b5281e69a7d52fc8261d0d.tar.gz
mdev-4173: Wrong result (extra row) with semijoin=on, joins in outer query, LEFT JOIN in the subquery
Apply the patch from Patryk Pomykalski: - create_internal_tmp_table_from_heap() will now return information whether the last row that we tried to write was a duplicate row. (mysql-5.6 also has this change)
Diffstat (limited to 'sql/sql_expression_cache.cc')
-rw-r--r--sql/sql_expression_cache.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_expression_cache.cc b/sql/sql_expression_cache.cc
index e65ec3c22b0..f3c96ee2d2f 100644
--- a/sql/sql_expression_cache.cc
+++ b/sql/sql_expression_cache.cc
@@ -288,7 +288,7 @@ my_bool Expression_cache_tmptable::put_value(Item *value)
if (create_internal_tmp_table_from_heap(table_thd, cache_table,
cache_table_param.start_recinfo,
&cache_table_param.recinfo,
- error, 1))
+ error, 1, NULL))
goto err;
}
}