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 branch '10.6' into 10.11

Browse Source
This commit is contained in:
Sergei Golubchik
2025-01-10 13:14:42 +01:00
parent 311e88c67a ff1f611a0d
commit 221aa5e08f
73 changed files with 1354 additions and 1342 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_error.cc
View File

@@ -693,7 +693,6 @@ Sql_condition *Warning_info::push_warning(THD *thd,
ulong current_row_number)
{
Sql_condition *cond= NULL;
DBUG_ASSERT(msg[strlen(msg)-1] != '\n');
if (! m_read_only)
{
@@ -753,6 +752,7 @@ void push_warning(THD *thd, Sql_condition::enum_warning_level level,
if (level == Sql_condition::WARN_LEVEL_ERROR)
level= Sql_condition::WARN_LEVEL_WARN;
DBUG_ASSERT(msg[strlen(msg)-1] != '\n');
(void) thd->raise_condition(code, "\0\0\0\0\0", level, msg);
/* Make sure we also count warnings pushed after calling set_ok_status(). */