summaryrefslogtreecommitdiff
path: root/sql/table.cc
diff options
context:
space:
mode:
authorSergey Petrunya <psergey@askmonty.org>2011-12-07 01:03:00 +0400
committerSergey Petrunya <psergey@askmonty.org>2011-12-07 01:03:00 +0400
commit8e25dcfcd7bc1ccf9d65b2f12eba4543ed1bf9f4 (patch)
tree902b1c51f21914d62467f9ec550d9dab22ad1897 /sql/table.cc
parent264aaf111d0493f0472e704ad7dda426f81376ea (diff)
downloadmariadb-git-8e25dcfcd7bc1ccf9d65b2f12eba4543ed1bf9f4.tar.gz
BUG#868908: Crash in check_simple_equality() with semijoin + materialization + prepared statement
- Part 1 of the fix: for semi-join merged subqueries, calling child_join->optimize() until we're done with all PS-lifetime optimizations in the parent.
Diffstat (limited to 'sql/table.cc')
-rw-r--r--sql/table.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/table.cc b/sql/table.cc
index 23c43f91d22..28c45a77396 100644
--- a/sql/table.cc
+++ b/sql/table.cc
@@ -5922,6 +5922,8 @@ bool TABLE_LIST::init_derived(THD *thd, bool init_view)
int TABLE_LIST::fetch_number_of_rows()
{
int error= 0;
+ if (jtbm_subselect) /* psergey-todo: how did we work before? */
+ return 0; /*psergey-todo: check if we still need to set it? */
if (is_materialized_derived() && !fill_me)
{