diff options
| author | unknown <hf@deer.(none)> | 2004-03-16 14:59:22 +0400 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2004-03-16 14:59:22 +0400 |
| commit | 26d0c4b1b4b78971e95b78117e2401c658ef1aa0 (patch) | |
| tree | 55decae2a516ff1d04ff9eb9e940b4b6a0d12c2c /sql/field.h | |
| parent | f5b1078b1cac4ec038a669848513440de0d912e1 (diff) | |
| download | mariadb-git-26d0c4b1b4b78971e95b78117e2401c658ef1aa0.tar.gz | |
Fix for #233 (final part)
mysql-test/r/gis.result:
test result added
mysql-test/t/gis.test:
test case added
sql/field.h:
now set_field_to_null can return -1
sql/field_conv.cc:
now set_field_to_null* can return -1
Diffstat (limited to 'sql/field.h')
| -rw-r--r-- | sql/field.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/field.h b/sql/field.h index f815324c698..22d406b339a 100644 --- a/sql/field.h +++ b/sql/field.h @@ -1184,8 +1184,8 @@ Field *make_field(char *ptr, uint32 field_length, struct st_table *table); uint pack_length_to_packflag(uint type); uint32 calc_pack_length(enum_field_types type,uint32 length); -bool set_field_to_null(Field *field); -bool set_field_to_null_with_conversions(Field *field, bool no_conversions); +int set_field_to_null(Field *field); +int set_field_to_null_with_conversions(Field *field, bool no_conversions); bool test_if_int(const char *str, int length, const char *int_end, CHARSET_INFO *cs); |