diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-01-14 12:37:55 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-01-17 00:44:16 +0100 |
| commit | 1ea2b2956b8204e58a515f8828f8749f321a0692 (patch) | |
| tree | 073eade17c0ad6f412ba9e1b9141d9dd21fa7c69 /sql | |
| parent | edb637591016bc6ecde4c0e98f829425174a6118 (diff) | |
| download | mariadb-git-1ea2b2956b8204e58a515f8828f8749f321a0692.tar.gz | |
Revert "MDEV-14786 Server crashes in Item_cond::transform on 2nd execution of SP querying from a view [fixes #436]"
This reverts commit 7069071d7de774dcf28f73b6a968bcb730a12885
And add a test to show that optimization steps that
a) are repeated for every execution
b) create new items
cannot be done on the statement arena
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_select.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 1781b7ccfcb..0527eef4fde 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -14677,8 +14677,6 @@ static COND* substitute_for_best_equal_field(THD *thd, JOIN_TAB *context_tab, Item_equal *item_equal; COND *org_cond= cond; // Return this in case of fatal error - Query_arena_stmt on_stmt_arena(thd); - if (cond->type() == Item::COND_ITEM) { List<Item> *cond_list= ((Item_cond*) cond)->argument_list(); @@ -15800,8 +15798,6 @@ optimize_cond(JOIN *join, COND *conds, THD *thd= join->thd; DBUG_ENTER("optimize_cond"); - Query_arena_stmt on_stmt_arena(thd); - if (!conds) { *cond_value= Item::COND_TRUE; |