diff options
| author | Igor Babaev <igor@askmonty.org> | 2012-03-17 01:26:58 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2012-03-17 01:26:58 -0700 |
| commit | 5d954e7cd0f9f4106d848a7d7fc8fbce35668785 (patch) | |
| tree | bd812fb49b473d759c5054fe89d12e4dc1e50a59 /sql/sql_base.cc | |
| parent | d110e0377dda1bb9f5a5c36745d3a6feb8e8a1d4 (diff) | |
| parent | 5338a28912589f1169b66b880a489ec5636bcd83 (diff) | |
| download | mariadb-git-5d954e7cd0f9f4106d848a7d7fc8fbce35668785.tar.gz | |
Merge 5.3->5.5
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 9fd6e0efafe..9298d3ccb72 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -8662,6 +8662,17 @@ int setup_conds(THD *thd, TABLE_LIST *tables, List<TABLE_LIST> &leaves, goto err_no_arena; select_lex->cond_count++; } + /* + If it's a semi-join nest, fix its "left expression", as it is used by + the SJ-Materialization + */ + if (embedded->sj_subq_pred) + { + Item **left_expr= &embedded->sj_subq_pred->left_expr; + if (!(*left_expr)->fixed && (*left_expr)->fix_fields(thd, left_expr)) + goto err_no_arena; + } + embedding= embedded->embedding; } while (embedding && |