diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2018-01-15 14:50:35 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2018-01-23 13:42:41 +0100 |
| commit | ba8d0fa700a73893979793785ed53f7bbd950df8 (patch) | |
| tree | fcd00cf7e93d7b3449025a89d9687180961f66c5 /sql/sql_select.cc | |
| parent | 11408a69adc6749c855a9867fc4db3e3d45236c3 (diff) | |
| download | mariadb-git-ba8d0fa700a73893979793785ed53f7bbd950df8.tar.gz | |
MDEV-14786: Server crashes in Item_cond::transform on 2nd execution of SP querying from a view
MDEV-14957: JOIN::prepare gets unusable "conds" as argument
Do not touch merged derived (it is irreversible)
Fix first argument of in_optimizer for calls possible before fix_fields()
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 5db503cd266..90bb536c0e2 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -638,6 +638,9 @@ JOIN::prepare(Item ***rref_pointer_array, join_list= &select_lex->top_join_list; union_part= unit_arg->is_union(); + // simple check that we got usable conds + dbug_print_item(conds); + if (select_lex->handle_derived(thd->lex, DT_PREPARE)) DBUG_RETURN(1); |