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

Merge 10.6 into 10.11

Browse Source
This commit is contained in:
Marko Mäkelä
2024-12-19 15:38:53 +02:00
parent c391fb1ff1 c982a143fc
commit a54d151fc1
129 changed files with 1398 additions and 1726 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/handler.cc
View File

@@ -4678,6 +4678,12 @@ void handler::print_error(int error, myf errflag)
case HA_ERR_PARTITION_LIST:
my_error(ER_VERS_NOT_ALLOWED, errflag, table->s->db.str, table->s->table_name.str);
DBUG_VOID_RETURN;
case HA_ERR_ROLLBACK:
/* Crash if we run with --debug-assert-on-error */
DBUG_ASSERT(!debug_assert_if_crashed_table);
SET_FATAL_ERROR;
textno= ER_ROLLBACK_ONLY;
break;
default:
{
/* The error was "unknown" to this function.
@@ -4712,7 +4718,7 @@ void handler::print_error(int error, myf errflag)
/* Ensure this becomes a true error */
errflag&= ~(ME_WARNING | ME_NOTE);
if ((debug_assert_if_crashed_table ||
global_system_variables.log_warnings > 1))
global_system_variables.log_warnings > 1))
{
/*
Log error to log before we crash or if extended warnings are requested