From 0fb30122ca6a6e95f63e82e4253d7bb816fc95aa Mon Sep 17 00:00:00 2001
From: Venkata Sidagam <venkata.sidagam@oracle.com>
Date: Thu, 19 Dec 2013 16:08:38 +0530
Subject: [PATCH] Bug #17780290 	PUBLISH THE GIS TEST FOR BUG#16451878

Adding the test cases for the BUG#16451878.
---
 mysql-test/r/gis.result | 21 +++++++++++++++++++++
 mysql-test/t/gis.test   | 18 ++++++++++++++++++
 2 files changed, 39 insertions(+)

diff --git a/mysql-test/r/gis.result b/mysql-test/r/gis.result
index 46a36ad8276..89b9d97b85b 100644
--- a/mysql-test/r/gis.result
+++ b/mysql-test/r/gis.result
@@ -1113,4 +1113,25 @@ SELECT 1 FROM g1 WHERE a >= ANY
 (SELECT 1 FROM g1 WHERE a = geomfromtext('') OR a) ;
 1
 DROP TABLE g1;
+#
+# Bug#16451878 GEOMETRY QUERY CRASHES SERVER
+#
+# should not crash
+SELECT ASTEXT(0x0100000000030000000100000000000010);
+ASTEXT(0x0100000000030000000100000000000010)
+NULL
+#should not crash
+SELECT ENVELOPE(0x0100000000030000000100000000000010);
+ENVELOPE(0x0100000000030000000100000000000010)
+NULL
+#should not crash
+SELECT
+GEOMETRYN(0x0100000000070000000100000001030000000200000000000000ffff0000, 1);
+GEOMETRYN(0x0100000000070000000100000001030000000200000000000000ffff0000, 1)
+NULL
+#should not crash
+SELECT
+GEOMETRYN(0x0100000000070000000100000001030000000200000000000000ffffff0f, 1);
+GEOMETRYN(0x0100000000070000000100000001030000000200000000000000ffffff0f, 1)
+NULL
 End of 5.5 tests
diff --git a/mysql-test/t/gis.test b/mysql-test/t/gis.test
index d10192aa3c5..b16de7d323b 100644
--- a/mysql-test/t/gis.test
+++ b/mysql-test/t/gis.test
@@ -868,4 +868,22 @@ SELECT 1 FROM g1 WHERE a >= ANY
 
 DROP TABLE g1;
 
+--echo #
+--echo # Bug#16451878 GEOMETRY QUERY CRASHES SERVER
+--echo #
+
+--echo # should not crash
+SELECT ASTEXT(0x0100000000030000000100000000000010);
+
+--echo #should not crash
+SELECT ENVELOPE(0x0100000000030000000100000000000010);
+
+--echo #should not crash
+SELECT
+  GEOMETRYN(0x0100000000070000000100000001030000000200000000000000ffff0000, 1);
+
+--echo #should not crash
+SELECT
+  GEOMETRYN(0x0100000000070000000100000001030000000200000000000000ffffff0f, 1);
+
 --echo End of 5.5 tests