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.5 into 10.6

Browse Source
This commit is contained in:
Marko Mäkelä
2021-09-11 17:55:27 +03:00
parent 54f79a0f7f 40b743f99e
commit 15139964d5
241 changed files with 5672 additions and 10041 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_truncate.cc
View File

@ -494,10 +494,9 @@ bool Sql_cmd_truncate_table::truncate_table(THD *thd, TABLE_LIST *table_ref)
if (thd->locked_tables_mode && thd->locked_tables_list.reopen_tables(thd, false))
{
thd->locked_tables_list.unlink_all_closed_tables(thd, NULL, 0);
error=1;
thd->locked_tables_list.unlink_all_closed_tables(thd, NULL, 0);
error= 1;
}
/* No need to binlog a failed truncate-by-recreate. */
binlog_stmt= !error;
}