diff options
author | unknown <hf@deer.(none)> | 2005-04-29 20:23:02 +0500 |
---|---|---|
committer | unknown <hf@deer.(none)> | 2005-04-29 20:23:02 +0500 |
commit | 1df25ccdac1855e82fc04b2055c193864f8b33b9 (patch) | |
tree | a1ccc4cac7fa2e450dd06586cd94df5312459b26 /sql/sql_base.cc | |
parent | cfd042108a8d4a38422d965b2a1d1fc8f32f7330 (diff) | |
download | mariadb-git-1df25ccdac1855e82fc04b2055c193864f8b33b9.tar.gz |
Fix for #6553 and #8776 (no errors on bad spatial data)
mysql-test/r/gis-rtree.result:
test result fixed
mysql-test/r/gis.result:
test result fixed
mysql-test/t/gis-rtree.test:
test case fixed
mysql-test/t/gis.test:
test case added
sql/field.cc:
error messages launched now when we try to put bad spatial
data in the GEOMETRY field
sql/field.h:
interface fixed
sql/item_geofunc.cc:
bad_data sign now instead of NULL now returned from
Item_geometry_from_text::val_str
sql/share/errmsg.txt:
error message added
sql/spatial.cc:
bad_geometry data instance
sql/spatial.h:
bad_geometry_data declaration
sql/sql_base.cc:
messages now created in store_* function
Diffstat (limited to 'sql/sql_base.cc')
-rw-r--r-- | sql/sql_base.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index d79811aa4e2..ade1fb96b96 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -3858,11 +3858,8 @@ fill_record(THD *thd, Field **ptr, List<Item> &values, bool ignore_errors) TABLE *table= field->table; if (field == table->next_number_field) table->auto_increment_field_not_null= TRUE; - if ((value->save_in_field(field, 0) < 0) && !ignore_errors) - { - my_message(ER_UNKNOWN_ERROR, ER(ER_UNKNOWN_ERROR), MYF(0)); + if (value->save_in_field(field, 0) == -1) DBUG_RETURN(TRUE); - } } DBUG_RETURN(thd->net.report_error); } |