database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge branch '11.4' into 11.7

Browse Source 
* rpl.rpl_system_versioning_partitions updated for MDEV-32188
* innodb.row_size_error_log_warnings_3 changed error for MDEV-33658
  (checks are done in a different order)
This commit is contained in:
Sergei Golubchik
2025-02-06 16:46:02 +01:00
parent 14a80f0929 0771110266
commit ba01c2aaf0
470 changed files with 12036 additions and 6930 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/sql_type.cc
View File

@ -7943,8 +7943,13 @@ Type_handler_datetime_common::convert_item_for_comparison(
const char *msg,
Sql_condition **cond_hdl) override
{
hit++;
return *level >= Sql_condition::WARN_LEVEL_WARN;
if (sql_errno == ER_TRUNCATED_WRONG_VALUE ||
sql_errno == ER_DATETIME_FUNCTION_OVERFLOW)
{
hit++;
return *level >= Sql_condition::WARN_LEVEL_WARN;
}
return false;
}
} cnt_handler;