dbs/mariadb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch '11.6' into 11.7

Browse source
This commit is contained in:
Oleksandr Byelkin 2024-11-09 19:01:12 +01:00
commit b12ff287ec
789 changed files with 10342 additions and 4415 deletions
Download patch file Download diff file Expand all files Collapse all files

6
sql/sql_delete.cc
View file

@ -428,10 +428,10 @@ bool Sql_cmd_delete::delete_from_single_table(THD *thd)
DBUG_RETURN(TRUE);
}
const_cond_result= const_cond && (!conds || conds->val_int());
const_cond_result= const_cond && (!conds || conds->val_bool());
if (unlikely(thd->is_error()))
{
/* Error evaluating val_int(). */
/* Error evaluating val_bool(). */
DBUG_RETURN(TRUE);
}
@ -534,6 +534,7 @@ bool Sql_cmd_delete::delete_from_single_table(THD *thd)
{
thd->lex->current_select->save_leaf_tables(thd);
thd->lex->current_select->leaf_tables_saved= true;
thd->lex->current_select->first_cond_optimization= 0;
}
my_ok(thd, 0);
@ -579,6 +580,7 @@ bool Sql_cmd_delete::delete_from_single_table(THD *thd)
{
thd->lex->current_select->save_leaf_tables(thd);
thd->lex->current_select->leaf_tables_saved= true;
thd->lex->current_select->first_cond_optimization= 0;
}
my_ok(thd, 0);