database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

MDEV-18042 Server crashes upon adding a non-null date column under NO_ZERO_DATE with ALGORITHM=INPLACE

Browse Source 
accept table_name and db_name instead of table_share in make_truncated_value_warning
This commit is contained in:
Nikita Malyavin
2020-07-29 01:01:24 +10:00
parent 91ebf1844f
commit fd0abc890f
9 changed files with 64 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/sql_time.h
View File

@ -120,15 +120,18 @@ void make_truncated_value_warning(THD *thd,
Sql_condition::enum_warning_level level,
const ErrConv *str_val,
timestamp_type time_type,
const TABLE_SHARE *s, const char *field_name);
const char *db_name, const char *table_name,
const char *field_name);
static inline void make_truncated_value_warning(THD *thd,
Sql_condition::enum_warning_level level, const char *str_val,
uint str_length, timestamp_type time_type,
const TABLE_SHARE *s, const char *field_name)
const char *db_name, const char *table_name,
const char *field_name)
{
const ErrConvString str(str_val, str_length, &my_charset_bin);
make_truncated_value_warning(thd, level, &str, time_type, s, field_name);
make_truncated_value_warning(thd, level, &str, time_type, db_name, table_name,
field_name);
}
extern DATE_TIME_FORMAT *date_time_format_make(timestamp_type format_type,