diff options
| author | gluh@mysql.com/eagle.(none) <> | 2007-05-30 17:04:04 +0500 |
|---|---|---|
| committer | gluh@mysql.com/eagle.(none) <> | 2007-05-30 17:04:04 +0500 |
| commit | cdbdc4e7458a3e39ee1750f8ba3649b5988116b9 (patch) | |
| tree | 134c11bc469ee4aabe754acc47d156b38759bbed /sql/field_conv.cc | |
| parent | 268fdf5db3c5af670ab6a3dfa20d3358eb5a33bf (diff) | |
| download | mariadb-git-cdbdc4e7458a3e39ee1750f8ba3649b5988116b9.tar.gz | |
backport of Bug#11491 Misleading error message if not NULL column set to NULL, SQL mode TRADITIONAL
Diffstat (limited to 'sql/field_conv.cc')
| -rw-r--r-- | sql/field_conv.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/field_conv.cc b/sql/field_conv.cc index 5c74ea9e49f..410db357510 100644 --- a/sql/field_conv.cc +++ b/sql/field_conv.cc @@ -177,8 +177,7 @@ set_field_to_null_with_conversions(Field *field, bool no_conversions) } if (current_thd->count_cuted_fields == CHECK_FIELD_WARN) { - field->set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, - ER_WARN_NULL_TO_NOTNULL, 1); + field->set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_BAD_NULL_ERROR, 1); return 0; } if (!current_thd->no_errors) |