database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge 10.2 into 10.3

Browse Source
This commit is contained in:
Marko Mäkelä
2020-07-31 13:51:28 +03:00
parent 6053eb1ce2 f35d172103
commit 66ec3a770f
73 changed files with 880 additions and 349 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/field.cc
View File

@ -11388,7 +11388,8 @@ void Field::set_datetime_warning(Sql_condition::enum_warning_level level,
THD *thd= get_thd();
if (thd->really_abort_on_warning() && level >= Sql_condition::WARN_LEVEL_WARN)
make_truncated_value_warning(thd, level, str, ts_type,
table->s, field_name.str);
table->s->db.str, table->s->table_name.str,
field_name.str);
else
set_warning(level, code, cuted_increment);
}