diff options
| author | Nikita Malyavin <nikitamalyavin@gmail.com> | 2020-07-29 01:01:24 +1000 |
|---|---|---|
| committer | Nikita Malyavin <nikitamalyavin@gmail.com> | 2020-07-31 17:38:41 +1000 |
| commit | fd0abc890f99e2b5ca1b8ae4cb0dc3968eef1208 (patch) | |
| tree | e447f8d04288935cbaa44f70ac6fff2c465921db /sql/field.cc | |
| parent | 91ebf1844f4fbc36edb66023332a045895d07cf5 (diff) | |
| download | mariadb-git-fd0abc890f99e2b5ca1b8ae4cb0dc3968eef1208.tar.gz | |
MDEV-18042 Server crashes upon adding a non-null date column under NO_ZERO_DATE with ALGORITHM=INPLACE
accept table_name and db_name instead of table_share in make_truncated_value_warning
Diffstat (limited to 'sql/field.cc')
| -rw-r--r-- | sql/field.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/field.cc b/sql/field.cc index 65bd9d22857..9a1779dea5f 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -11059,7 +11059,7 @@ 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); + table->s->db.str, table->s->table_name.str, field_name); else set_warning(level, code, cuted_increment); } |