mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
MDEV-14786 Server crashes in Item_cond::transform on 2nd execution of SP querying from a view
instead of skipping invalid items in setup_conds(), don't pass them into a JOIN at all (test case in versioning.select2)
This commit is contained in:
@ -7997,10 +7997,6 @@ int setup_conds(THD *thd, TABLE_LIST *tables, List<TABLE_LIST> &leaves,
|
||||
TABLE_LIST *derived= select_lex->master_unit()->derived;
|
||||
DBUG_ENTER("setup_conds");
|
||||
|
||||
/* Do not fix conditions for the derived tables that have been merged */
|
||||
if (derived && derived->merged)
|
||||
DBUG_RETURN(0);
|
||||
|
||||
select_lex->is_item_list_lookup= 0;
|
||||
|
||||
thd->mark_used_columns= MARK_COLUMNS_READ;
|
||||
|
Reference in New Issue
Block a user