1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-25346: JSON_TABLE: Server crashes in Item_field::fix_outer_field ...

Browse Source 
Use a function instead of lambda

(TODO: squash this with previous patch for MDEV-25346)
This commit is contained in:
Sergei Petrunia 2021-04-12 13:16:20 +03:00 committed by Alexey Botchkov
parent 1b81e23737
commit eb2550ee78
1 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
sql/sql_derived.cc
View File

@ -23,7 +23,6 @@
#include "mariadb.h" /* NO_EMBEDDED_ACCESS_CHECKS */ #include "mariadb.h" /* NO_EMBEDDED_ACCESS_CHECKS */
#include <functional>
#include "sql_priv.h" #include "sql_priv.h"
#include "unireg.h" #include "unireg.h"
#include "sql_derived.h" #include "sql_derived.h"
@ -597,6 +596,25 @@ bool mysql_derived_init(THD *thd, LEX *lex, TABLE_LIST *derived)
} }
/*
@brief
Reset the Name_resolution_context::outer_context for all ON expression
contexts in the given nested join. Do this recursively for all nested joins
it contains.
*/
static void reset_on_clauses_context(List<TABLE_LIST>& join_list)
{
List_iterator<TABLE_LIST> li(join_list);
while (TABLE_LIST *table= li++)
{
if (table->on_context)
table->on_context->outer_context= NULL;
if (table->nested_join)
reset_on_clauses_context(table->nested_join->join_list);
}
}
/* /*
Create temporary table structure (but do not fill it) Create temporary table structure (but do not fill it)
@ -765,19 +783,7 @@ bool mysql_derived_prepare(THD *thd, LEX *lex, TABLE_LIST *derived)
sl->context.outer_context= 0; sl->context.outer_context= 0;
// And for ON clauses, if there are any // And for ON clauses, if there are any
std::function<void(List<TABLE_LIST>&)> reset_context= reset_on_clauses_context(*sl->join_list);
[&](List<TABLE_LIST> &join_list)
{
List_iterator<TABLE_LIST> li(join_list);
while (TABLE_LIST *table= li++)
{
if (table->on_context)
table->on_context->outer_context= NULL;
if (table->nested_join)
reset_context(table->nested_join->join_list);
}
};
reset_context(*sl->join_list);
if (!derived->is_with_table_recursive_reference() || if (!derived->is_with_table_recursive_reference() ||
(!derived->with->with_anchor && (!derived->with->with_anchor &&