diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-11-18 22:25:41 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-11-18 22:25:41 +0100 |
| commit | a8bd285f7c0b65f76df0d81472eab270de12532c (patch) | |
| tree | 207439296acfffa2fdec87f5bea6d300ee81ccfa /sql/sql_derived.cc | |
| parent | 303eec5774ced6dd3fed09a80511ef18e82badb8 (diff) | |
| download | mariadb-git-a8bd285f7c0b65f76df0d81472eab270de12532c.tar.gz | |
MDEV-6785 Wrong result on 2nd execution of PS with aggregate function, FROM SQ or MERGE view
a different fix for view.test --ps-protocol crash
(revert the old fix that has caused a regression)
Diffstat (limited to 'sql/sql_derived.cc')
| -rw-r--r-- | sql/sql_derived.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/sql_derived.cc b/sql/sql_derived.cc index d3b3c11c4ac..14e26fbefa6 100644 --- a/sql/sql_derived.cc +++ b/sql/sql_derived.cc @@ -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); |