Commit 48fe2802 authored by igor@olga.mysql.com's avatar igor@olga.mysql.com

Post-merge fix.

parent 040e46fc
...@@ -4054,7 +4054,8 @@ err: ...@@ -4054,7 +4054,8 @@ err:
} }
bool save_abort_on_warning= thd->abort_on_warning; bool save_abort_on_warning= thd->abort_on_warning;
thd->abort_on_warning= TRUE; thd->abort_on_warning= TRUE;
make_truncated_value_warning(thd, f_val, strlength(f_val), t_type, make_truncated_value_warning(thd, MYSQL_ERROR::WARN_LEVEL_ERROR,
f_val, strlength(f_val), t_type,
new_datetime_field->field_name); new_datetime_field->field_name);
thd->abort_on_warning= save_abort_on_warning; thd->abort_on_warning= save_abort_on_warning;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment