diff options
| author | Alexey Botchkov <holyfoot@askmonty.org> | 2011-09-21 12:50:03 +0500 |
|---|---|---|
| committer | Alexey Botchkov <holyfoot@askmonty.org> | 2011-09-21 12:50:03 +0500 |
| commit | 6b64baf3b9c8a6c33dd47be62c0b73ab12157760 (patch) | |
| tree | 21d723c86ca82853f27d1ccdc6cfdc1dfe3963fd /sql/gstream.h | |
| parent | 25b5019c34e717aff95bf405e7d5eb15c2bedf75 (diff) | |
| download | mariadb-git-6b64baf3b9c8a6c33dd47be62c0b73ab12157760.tar.gz | |
fix for bug 848926 GIS functions return "GEOMETRYCOLLECTION()" instead of "GEOMETRYCOLLECTION EMPTY"
per-file comments:
mysql-test/r/gis.result
fix for bug 848926 GIS functions return "GEOMETRYCOLLECTION()" instead of "GEOMETRYCOLLECTION EMPTY"
test result updated.
mysql-test/t/gis.test
fix for bug 848926 GIS functions return "GEOMETRYCOLLECTION()" instead of "GEOMETRYCOLLECTION EMPTY"
test case added.
sql/gstream.cc
fix for bug 848926 GIS functions return "GEOMETRYCOLLECTION()" instead of "GEOMETRYCOLLECTION EMPTY"
lookup_next_word() implemented.
sql/gstream.h
fix for bug 848926 GIS functions return "GEOMETRYCOLLECTION()" instead of "GEOMETRYCOLLECTION EMPTY"
lookup_next_word() added.
sql/spatial.cc
fix for bug 848926 GIS functions return "GEOMETRYCOLLECTION()" instead of "GEOMETRYCOLLECTION EMPTY"
name changed for the empty geometry.
sql/spatial.h
fix for bug 848926 GIS functions return "GEOMETRYCOLLECTION()" instead of "GEOMETRYCOLLECTION EMPTY"
declarations modified.
Diffstat (limited to 'sql/gstream.h')
| -rw-r--r-- | sql/gstream.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/gstream.h b/sql/gstream.h index a1850e9a333..d3a40f4e7e0 100644 --- a/sql/gstream.h +++ b/sql/gstream.h @@ -39,6 +39,7 @@ public: } enum enum_tok_types get_next_toc_type(); + bool lookup_next_word(LEX_STRING *res); bool get_next_word(LEX_STRING *); bool get_next_number(double *); bool check_next_symbol(char); |