database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge remote-tracking branch 'origin/11.4' into 11.5

Browse Source
This commit is contained in:
Alexander Barkov
2024-07-10 08:51:12 +04:00
parent 8f4ec79d09 5fb07d942b
commit 4e805aed85
645 changed files with 14630 additions and 11292 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_table.cc
View File

@@ -11802,6 +11802,7 @@ end_temporary:
thd->variables.option_bits&= ~OPTION_BIN_COMMIT_OFF;
thd_progress_end(thd);
*recreate_info= Recreate_info(copied, deleted);
thd->my_ok_with_recreate_info(*recreate_info,
(ulong) thd->get_stmt_da()->
@@ -11929,7 +11930,7 @@ class Has_default_error_handler : public Internal_error_handler
public:
bool handle_condition(THD *, uint sql_errno, const char *,
Sql_condition::enum_warning_level *,
const char *, Sql_condition **)
const char *, Sql_condition **) override
{
return sql_errno == ER_NO_DEFAULT_FOR_FIELD;
}