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

Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext

Browse Source
This commit is contained in:
Alexander Barkov
2017-03-31 16:40:29 +04:00
parent e191833d75 2f3d4bd566
commit f00a314f9a
1719 changed files with 29743 additions and 15779 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_derived.cc
View File

@ -449,6 +449,9 @@ bool mysql_derived_merge(THD *thd, LEX *lex, TABLE_LIST *derived)
{
Item *expr= derived->on_expr;
expr= and_conds(thd, expr, dt_select->join ? dt_select->join->conds : 0);
if (expr)
expr->top_level_item();
if (expr && (derived->prep_on_expr || expr != derived->on_expr))
{
derived->on_expr= expr;