diff options
Diffstat (limited to 'sql/sql_derived.cc')
| -rw-r--r-- | sql/sql_derived.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/sql_derived.cc b/sql/sql_derived.cc index 9c3f67c651b..254a7bceefd 100644 --- a/sql/sql_derived.cc +++ b/sql/sql_derived.cc @@ -21,7 +21,7 @@ */ -#include "my_global.h" /* NO_EMBEDDED_ACCESS_CHECKS */ +#include <my_global.h> /* NO_EMBEDDED_ACCESS_CHECKS */ #include "sql_priv.h" #include "unireg.h" #include "sql_derived.h" @@ -465,8 +465,6 @@ bool mysql_derived_merge(THD *thd, LEX *lex, TABLE_LIST *derived) } } - if (!derived->merged_for_insert) - dt_select->first_cond_optimization= FALSE; // consider it optimized exit_merge: if (arena) thd->restore_active_arena(arena, &backup); |