mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
merging
This commit is contained in:
@ -5771,11 +5771,13 @@ bool setup_tables_and_check_access(THD *thd,
|
|||||||
TABLE_LIST *leaves_tmp= NULL;
|
TABLE_LIST *leaves_tmp= NULL;
|
||||||
bool first_table= true;
|
bool first_table= true;
|
||||||
|
|
||||||
|
thd->leaf_count= 0;
|
||||||
if (setup_tables(thd, context, from_clause, tables,
|
if (setup_tables(thd, context, from_clause, tables,
|
||||||
&leaves_tmp, select_insert))
|
&leaves_tmp, select_insert))
|
||||||
return TRUE;
|
return TRUE;
|
||||||
|
|
||||||
*leaves= leaves_tmp;
|
if (leaves)
|
||||||
|
*leaves= leaves_tmp;
|
||||||
|
|
||||||
for (; leaves_tmp; leaves_tmp= leaves_tmp->next_leaf)
|
for (; leaves_tmp; leaves_tmp= leaves_tmp->next_leaf)
|
||||||
{
|
{
|
||||||
@ -5787,6 +5789,7 @@ bool setup_tables_and_check_access(THD *thd,
|
|||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
first_table= 0;
|
first_table= 0;
|
||||||
|
thd->leaf_count++;
|
||||||
}
|
}
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user