diff options
| author | Igor Babaev <igor@askmonty.org> | 2013-10-13 18:10:19 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2013-10-13 18:10:19 -0700 |
| commit | ddc46740a56bf3885ae33dc21e281c063d189abf (patch) | |
| tree | 95de2e32ed970c1370e9c3fa15290b88d13955da /sql/sql_base.cc | |
| parent | d61cffa6b1dd8b25dbae2536af1b0b59091b9f06 (diff) | |
| parent | c7db46a2427e933a379d0a8c62221c344a29ea06 (diff) | |
| download | mariadb-git-ddc46740a56bf3885ae33dc21e281c063d189abf.tar.gz | |
Merge 5.5->10.0-base
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 0f986e67828..bfafb0d4d9b 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -8697,7 +8697,6 @@ int setup_conds(THD *thd, TABLE_LIST *tables, List<TABLE_LIST> &leaves, embedded->on_expr->fix_fields(thd, &embedded->on_expr)) || embedded->on_expr->check_cols(1)) goto err_no_arena; - select_lex->cond_count++; } /* If it's a semi-join nest, fix its "left expression", as it is used by |