summaryrefslogtreecommitdiff
path: root/sql/opt_subselect.cc
diff options
context:
space:
mode:
authorSergey Petrunya <psergey@askmonty.org>2010-10-18 12:55:26 +0400
committerSergey Petrunya <psergey@askmonty.org>2010-10-18 12:55:26 +0400
commit6765cc3017d99f3f767d59778c97401e06fd898d (patch)
treeb3d59eeabe1e0a36c5e01231a9de1767d887a057 /sql/opt_subselect.cc
parentf75fd03ea9a8157de3128af1157a36dd2f604a0d (diff)
downloadmariadb-git-6765cc3017d99f3f767d59778c97401e06fd898d.tar.gz
# No BUG#, a case brought from 5.2's innodb_mysql_lock.test
- Fix a crash in nested semi-join subquery processing
Diffstat (limited to 'sql/opt_subselect.cc')
-rw-r--r--sql/opt_subselect.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/opt_subselect.cc b/sql/opt_subselect.cc
index c7adec45690..a58313ec9fd 100644
--- a/sql/opt_subselect.cc
+++ b/sql/opt_subselect.cc
@@ -803,7 +803,7 @@ static bool convert_subq_to_sj(JOIN *parent_join, Item_in_subselect *subq_pred)
sj_nest->nested_join->sj_corr_tables= subq_pred->used_tables();
sj_nest->nested_join->sj_depends_on= subq_pred->used_tables() |
subq_pred->left_expr->used_tables();
- sj_nest->sj_on_expr= subq_lex->where;
+ sj_nest->sj_on_expr= subq_lex->join->conds;
/*
Create the IN-equalities and inject them into semi-join's ON expression.