database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge 10.10 into 10.11

Browse Source
This commit is contained in:
Marko Mäkelä
2023-04-14 13:08:28 +03:00
parent 17caff92b5 a009280e60
commit 656c2e18b1
382 changed files with 13277 additions and 7524 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_delete.cc
View File

@ -1096,6 +1096,8 @@ int mysql_prepare_delete(THD *thd, TABLE_LIST *table_list, Item **conds,
DBUG_RETURN(TRUE);
select_lex->fix_prepare_information(thd, conds, &fake_conds);
if (!thd->lex->upd_del_where)
thd->lex->upd_del_where= *conds;
DBUG_RETURN(FALSE);
}