database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-05 13:16:09 +03:00
Code Activity

MDEV-36638 Some optimizer hint warnings are returned as errors

Browse Source 
With strict SQL_MODE warnings generated during DDL statements
are threated as errors. This is done to prevent potential data
corruption. However, optimizer hints cannot affect the integrity
of data, so warnings during their parsing or application should not
be escalated to the level of errors.

This commit introduces `push_warning_safe()` method that guarantees
that a warning is not treated as an error, and generation of warnings
during hints processing now uses this method instead of traditional
`push_warning_printf()`
This commit is contained in:
Oleg Smirnov
2025-04-22 21:47:12 +07:00
parent 6cd27dbc43
commit 6e2a0501b6
5 changed files with 142 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
sql/sql_error.cc
View File

@@ -783,22 +783,36 @@ void push_warning(THD *thd, Sql_condition::enum_warning_level level,
*/
void push_warning_printf(THD *thd, Sql_condition::enum_warning_level level,
uint code, const char *format, ...)
uint code, const char *format, ...)
{
va_list args;
char warning[MYSQL_ERRMSG_SIZE];
DBUG_ENTER("push_warning_printf");
DBUG_PRINT("enter",("warning: %u", code));
va_start(args,format);
push_warning_printf_va_list(thd, level,code, format, args);
va_end(args);
DBUG_VOID_RETURN;
}
/*
This is an overload of push_warning_printf() accepting va_list as a list
of format arguments.
*/
void push_warning_printf_va_list(THD *thd,
Sql_condition::enum_warning_level level,
uint code, const char *format, va_list args)
{
char warning[MYSQL_ERRMSG_SIZE];
DBUG_ASSERT(code != 0);
DBUG_ASSERT(format != NULL);
va_start(args,format);
my_vsnprintf_ex(&my_charset_utf8mb3_general_ci, warning,
sizeof(warning), format, args);
va_end(args);
push_warning(thd, level, code, warning);
DBUG_VOID_RETURN;
}