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

MDEV-35307 Unexpected error WARN_SORTING_ON_TRUNCATED_LENGTH or assertion failure in diagnostics area #2

Browse Source 
When strict mode is enabled, all warnings during `INSERT` are
converted to errors regardless of their actual severity.
`WARN_SORTING_ON_TRUNCATED_LENGTH` is not considered severe enough
to be elevated to the ERROR level, and this commit fixes that
This commit is contained in:
Oleg Smirnov
2024-11-02 18:25:10 +07:00
parent a4cb03ec56
commit a914087fab
4 changed files with 50 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
sql/sql_class.cc
View File

@@ -8632,6 +8632,32 @@ error:
}
/*
Push post-execution warnings, which may be some kinds of aggregate messages
like number of times max_sort_length was reached during sorting/grouping
*/
void THD::push_final_warnings()
{
if (num_of_strings_sorted_on_truncated_length)
{
/*
WARN_SORTING_ON_TRUNCATED_LENGTH is not considered important enough to be
elevated to the ERROR level, so reset abort_on_warning flag before pushing
*/
bool saved_abort_on_warning= abort_on_warning;
abort_on_warning= false;
push_warning_printf(this, Sql_condition::WARN_LEVEL_WARN,
WARN_SORTING_ON_TRUNCATED_LENGTH,
ER_THD(this, WARN_SORTING_ON_TRUNCATED_LENGTH),
num_of_strings_sorted_on_truncated_length,
variables.max_sort_length);
num_of_strings_sorted_on_truncated_length= 0;
abort_on_warning= saved_abort_on_warning;
}
}
void AUTHID::copy(MEM_ROOT *mem_root, const LEX_CSTRING *user_name,
const LEX_CSTRING *host_name)
{