summaryrefslogtreecommitdiff
path: root/sql/sql_select.h
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_select.h
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_select.h')
-rw-r--r--sql/sql_select.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_select.h b/sql/sql_select.h
index 7168fd54024..478eede7108 100644
--- a/sql/sql_select.h
+++ b/sql/sql_select.h
@@ -1819,7 +1819,8 @@ void free_tmp_table(THD *thd, TABLE *entry);
bool create_internal_tmp_table_from_heap(THD *thd, TABLE *table,
ENGINE_COLUMNDEF *start_recinfo,
ENGINE_COLUMNDEF **recinfo,
- int error, bool ignore_last_dupp_key_error);
+ int error, bool ignore_last_dupp_key_error,
+ bool *is_duplicate);
bool create_internal_tmp_table(TABLE *table, KEY *keyinfo,
ENGINE_COLUMNDEF *start_recinfo,
ENGINE_COLUMNDEF **recinfo,