summaryrefslogtreecommitdiff
path: root/sql/sql_union.cc
diff options
context:
space:
mode:
authorunknown <sanja@montyprogram.com>2012-02-14 16:52:56 +0200
committerunknown <sanja@montyprogram.com>2012-02-14 16:52:56 +0200
commit764eeeee74f999fe2107fc362236563be0025093 (patch)
tree8af3359111969a90c2670d887c5ef79262aab74f /sql/sql_union.cc
parent7ab53e80627e54c6dece486bf0b059436b7e5777 (diff)
downloadmariadb-git-764eeeee74f999fe2107fc362236563be0025093.tar.gz
Fix for LP BUG#910123 MariaDB 5.3.3 causes 1093 error on Drupal
Problem was that now we can merge derived table (subquery in the FROM clause). Fix: in case of detected conflict and presence of derived table "over" the table which cased the conflict - try materialization strategy.
Diffstat (limited to 'sql/sql_union.cc')
-rw-r--r--sql/sql_union.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc
index 90d9405ebe5..599dc993483 100644
--- a/sql/sql_union.cc
+++ b/sql/sql_union.cc
@@ -961,6 +961,7 @@ bool st_select_lex::cleanup()
}
non_agg_fields.empty();
inner_refs_list.empty();
+ exclude_from_table_unique_test= FALSE;
DBUG_RETURN(error);
}