diff options
| author | Alexey Botchkov <holyfoot@askmonty.org> | 2011-07-04 16:17:34 +0500 |
|---|---|---|
| committer | Alexey Botchkov <holyfoot@askmonty.org> | 2011-07-04 16:17:34 +0500 |
| commit | 7f55ea121191131723c99889943f8a278c5a7b4b (patch) | |
| tree | 05822e1d1ec37e565ce128d4ef0c1916cb6e6ba1 /mysql-test/t | |
| parent | 0e6c889c83bcf6c37526e3a3fee192bb59cab92e (diff) | |
| download | mariadb-git-7f55ea121191131723c99889943f8a278c5a7b4b.tar.gz | |
fix for bug #801212 Assertion with ST_INTERSECTION on NULL values
The ::val_str() method has to return NULL if it calculated
the null_value, not just set the related flag.
per-file comments:
mysql-test/r/gis-precise.result
fix for bug #801212 Assertion with ST_INTERSECTION on NULL values
test result updated.
mysql-test/t/gis-precise.test
fix for bug #801212 Assertion with ST_INTERSECTION on NULL values
test case added.
sql/item_geofunc.cc
fix for bug #801212 Assertion with ST_INTERSECTION on NULL values
return NULL from the val_str if we get the null_value.
Diffstat (limited to 'mysql-test/t')
| -rw-r--r-- | mysql-test/t/gis-precise.test | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mysql-test/t/gis-precise.test b/mysql-test/t/gis-precise.test index e267bcf57c1..72ba6b748be 100644 --- a/mysql-test/t/gis-precise.test +++ b/mysql-test/t/gis-precise.test @@ -115,5 +115,9 @@ SELECT astext(ST_UNION ( #bug 801189 ST_BUFFER asserts if radius = 0 SELECT astext(ST_BUFFER(LineStringFromText('LINESTRING(0 0,1 1)'),0)); -#buf 801199 Infinite recursion in Gcalc_function::count_internal with ST_BUFFER over MULTIPOINT +#bug 801199 Infinite recursion in Gcalc_function::count_internal with ST_BUFFER over MULTIPOINT SELECT Round(ST_Area(ST_BUFFER(MultipointFromText('MULTIPOINT(7 7,3 7,7 2,7 4 ,7 7)'), 3)), 5); + +#bug 801212 Assertion with ST_INTERSECTION on NULL values +SELECT ST_INTERSECTION(NULL, NULL); + |