Post-merge fix.
This commit is contained in:
parent
11dd353e12
commit
d7a90fa172
@ -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;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user