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_conv.cc | |
| 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_conv.cc')
| -rw-r--r-- | sql/field_conv.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/field_conv.cc b/sql/field_conv.cc index 47402c32aa4..3272c2faf48 100644 --- a/sql/field_conv.cc +++ b/sql/field_conv.cc @@ -109,7 +109,7 @@ static void do_outer_field_to_null_str(Copy_field *copy) } -bool +int set_field_to_null(Field *field) { if (field->real_maybe_null()) @@ -149,7 +149,7 @@ set_field_to_null(Field *field) If no_conversion was not set, an error message is printed */ -bool +int set_field_to_null_with_conversions(Field *field, bool no_conversions) { if (field->real_maybe_null()) |