mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
fixed removed by previos patch thd->allow_sum_func "side effect" of setup_conds
renamed tables to prevent droping real tables
This commit is contained in:
@ -2227,8 +2227,6 @@ int setup_conds(THD *thd,TABLE_LIST *tables,COND **conds)
|
||||
thd->set_query_id=1;
|
||||
|
||||
thd->cond_count= 0;
|
||||
bool save_allow_sum_func= thd->allow_sum_func;
|
||||
thd->allow_sum_func= 0;
|
||||
if (*conds)
|
||||
{
|
||||
thd->where="where clause";
|
||||
@ -2301,7 +2299,6 @@ int setup_conds(THD *thd,TABLE_LIST *tables,COND **conds)
|
||||
table->on_expr=and_conds(table->on_expr,cond_and);
|
||||
}
|
||||
}
|
||||
thd->allow_sum_func= save_allow_sum_func;
|
||||
DBUG_RETURN(test(thd->fatal_error));
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user