diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-31 18:09:08 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-31 18:09:08 +0300 |
| commit | 9216114ce729733e6b0c4ce952bfdf57595ff387 (patch) | |
| tree | 7a541ed87a6a8174d3d94c5f780724a34e08dc1c /sql/sql_table.cc | |
| parent | dc513dff911d72eaaf9f752f390fef8d1ef9a4b0 (diff) | |
| parent | 66ec3a770f7854f500ece66c78f3c87c9cd6da15 (diff) | |
| download | mariadb-git-9216114ce729733e6b0c4ce952bfdf57595ff387.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 2a3cdedd717..3831bd03802 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -10495,8 +10495,9 @@ err_new_table_cleanup: bool save_abort_on_warning= thd->abort_on_warning; thd->abort_on_warning= true; thd->push_warning_truncated_value_for_field(Sql_condition::WARN_LEVEL_WARN, - f_type, f_val, new_table - ? new_table->s : table->s, + f_type, f_val, + alter_ctx.new_db.str, + alter_ctx.new_name.str, alter_ctx.datetime_field-> field_name.str); thd->abort_on_warning= save_abort_on_warning; |