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

Merge 10.4 into 10.5

Browse Source
This commit is contained in:
Marko Mäkelä
2022-07-27 17:17:24 +03:00
parent 5bf4dee369 e5c4f4e590
commit 098c0f2634
278 changed files with 17690 additions and 7421 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_update.cc
View File

@ -427,7 +427,7 @@ int mysql_update(THD *thd,
DBUG_ASSERT(update_source_table || table_list->view != 0);
DBUG_PRINT("info", ("Switch to multi-update"));
/* pass counter value */
thd->lex->table_count= table_count;
thd->lex->table_count_update= table_count;
if (thd->lex->period_conditions.is_set())
{
my_error(ER_NOT_SUPPORTED_YET, MYF(0),
@ -1851,7 +1851,7 @@ int mysql_multi_update_prepare(THD *thd)
TABLE_LIST *table_list= lex->query_tables;
TABLE_LIST *tl;
Multiupdate_prelocking_strategy prelocking_strategy;
uint table_count= lex->table_count;
uint table_count= lex->table_count_update;
DBUG_ENTER("mysql_multi_update_prepare");
/*