database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge 5.5->10.0-base

Browse Source
This commit is contained in:
Igor Babaev
2013-10-13 18:10:19 -07:00
parent d61cffa6b1 c7db46a242
commit ddc46740a5
19 changed files with 356 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/sql_base.cc
View File

@ -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