From dd02c4a12b1c210d65dbf940e0d5b59aa65b6326 Mon Sep 17 00:00:00 2001
From: Georgi Kodinov <joro@sun.com>
Date: Wed, 21 Oct 2009 11:43:45 +0300
Subject: Bug #47780: crash when comparing GIS items from subquery

If the first argument to GeomFromWKB function is a geometry
field then the function just returns its value.
However in doing so it's not preserving first argument's
null_value flag and this causes unexpected null value to
be returned to the calling function.

Fixed by updating the null_value of the GeomFromWKB function
in such cases (and all other cases that return a NULL e.g.
because of not enough memory for the return buffer).
---
 mysql-test/r/gis.result | 12 ++++++++++++
 mysql-test/t/gis.test   | 16 ++++++++++++++++
 2 files changed, 28 insertions(+)

(limited to 'mysql-test')

diff --git a/mysql-test/r/gis.result b/mysql-test/r/gis.result
index 5b7a58add06..140c133d75f 100644
--- a/mysql-test/r/gis.result
+++ b/mysql-test/r/gis.result
@@ -971,4 +971,16 @@ select min(`col002`) from t1 union select `col002` from t1;
 min(`col002`)
 NULL
 drop table t1;
+#
+# Bug #47780: crash when comparing GIS items from subquery
+#
+CREATE TABLE t1(a INT, b MULTIPOLYGON);
+INSERT INTO t1 VALUES 
+(0,
+GEOMFROMTEXT(
+'multipolygon(((1 2,3 4,5 6,7 8,9 8),(7 6,5 4,3 2,1 2,3 4)))'));
+# must not crash
+SELECT 1 FROM t1 WHERE a <> (SELECT GEOMETRYCOLLECTIONFROMWKB(b) FROM t1);
+1
+DROP TABLE t1;
 End of 5.0 tests
diff --git a/mysql-test/t/gis.test b/mysql-test/t/gis.test
index c01fa205349..701a6cef6be 100644
--- a/mysql-test/t/gis.test
+++ b/mysql-test/t/gis.test
@@ -654,4 +654,20 @@ insert into t1 values (),(),();
 select min(`col002`) from t1 union select `col002` from t1;
 drop table t1;
 
+--echo #
+--echo # Bug #47780: crash when comparing GIS items from subquery
+--echo #
+
+CREATE TABLE t1(a INT, b MULTIPOLYGON);
+INSERT INTO t1 VALUES 
+  (0,
+   GEOMFROMTEXT(
+    'multipolygon(((1 2,3 4,5 6,7 8,9 8),(7 6,5 4,3 2,1 2,3 4)))'));
+
+--echo # must not crash
+SELECT 1 FROM t1 WHERE a <> (SELECT GEOMETRYCOLLECTIONFROMWKB(b) FROM t1);
+
+DROP TABLE t1;
+
+
 --echo End of 5.0 tests
-- 
cgit v1.2.1