From 140dd4f322fdbf341af255a4fcce187fbd08f71d Mon Sep 17 00:00:00 2001
From: "holyfoot/hf@mysql.com/hfmain.(none)" <>
Date: Mon, 19 Nov 2007 11:03:03 +0400
Subject: [PATCH 1/2] Bug #30284 spatial key corruption.

SPATIAL key is fine actually, but the chk_key() function
mistakenly returns error. It tries to compare checksums
of btree and SPATIAL keys while the checksum for the SPATIAL isn't
calculated (always 0). Same thing with FULLTEXT keys is handled
using full_text_keys counter, so fixed by counting both
SPATIAL and FULLTEXT keys in that counter.
---
 myisam/mi_check.c       |  2 +-
 mysql-test/r/gis.result |  8 ++++++++
 mysql-test/t/gis.test   | 11 +++++++++++
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/myisam/mi_check.c b/myisam/mi_check.c
index ce8fb04874e..64aa0b76877 100644
--- a/myisam/mi_check.c
+++ b/myisam/mi_check.c
@@ -454,7 +454,7 @@ int chk_key(MI_CHECK *param, register MI_INFO *info)
 
     if ((!(param->testflag & T_SILENT)))
       printf ("- check data record references index: %d\n",key+1);
-    if (keyinfo->flag & HA_FULLTEXT)
+    if (keyinfo->flag & (HA_FULLTEXT | HA_SPATIAL))
       full_text_keys++;
     if (share->state.key_root[key] == HA_OFFSET_ERROR &&
 	(info->state->records == 0 || keyinfo->flag & HA_FULLTEXT))
diff --git a/mysql-test/r/gis.result b/mysql-test/r/gis.result
index 55f70e59fcf..3c5b0491148 100644
--- a/mysql-test/r/gis.result
+++ b/mysql-test/r/gis.result
@@ -730,4 +730,12 @@ select geomfromtext(col9,col89) as a from t1;
 a
 NULL
 DROP TABLE t1;
+create table t1(col1 geometry not null,col15 geometrycollection not
+null,spatial index(col15),index(col1(15)))engine=myisam;
+insert into t1 set col15 = GeomFromText('POINT(6 5)');
+insert into t1 set col15 = GeomFromText('POINT(6 5)');
+check table t1 extended;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+drop table t1;
 End of 4.1 tests
diff --git a/mysql-test/t/gis.test b/mysql-test/t/gis.test
index cf5c3b31bc1..77e73e0d590 100644
--- a/mysql-test/t/gis.test
+++ b/mysql-test/t/gis.test
@@ -427,4 +427,15 @@ INSERT INTO `t1` VALUES ('','0000-00-00');
 select geomfromtext(col9,col89) as a from t1;
 DROP TABLE t1;
 
+#
+# Bug #30284 spatial key corruption 
+#
+
+create table t1(col1 geometry not null,col15 geometrycollection not
+null,spatial index(col15),index(col1(15)))engine=myisam;
+insert into t1 set col15 = GeomFromText('POINT(6 5)');
+insert into t1 set col15 = GeomFromText('POINT(6 5)');
+check table t1 extended;
+drop table t1;
+
 --echo End of 4.1 tests

From 7094295d991fe334a99e801d8b1623fca8b4beb4 Mon Sep 17 00:00:00 2001
From: "holyfoot/hf@mysql.com/hfmain.(none)" <>
Date: Sat, 24 Nov 2007 14:57:09 +0400
Subject: [PATCH 2/2] merging fix

---
 mysql-test/r/gis.result | 2 +-
 mysql-test/t/gis.test   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mysql-test/r/gis.result b/mysql-test/r/gis.result
index 9c7f2bb4beb..4334a34c3ff 100644
--- a/mysql-test/r/gis.result
+++ b/mysql-test/r/gis.result
@@ -742,7 +742,7 @@ select geomfromtext(col9,col89) as a from t1;
 a
 NULL
 DROP TABLE t1;
-create table t1(col1 geometry not null,col15 geometrycollection not
+create table t1(col1 geometry default null,col15 geometrycollection not
 null,spatial index(col15),index(col1(15)))engine=myisam;
 insert into t1 set col15 = GeomFromText('POINT(6 5)');
 insert into t1 set col15 = GeomFromText('POINT(6 5)');
diff --git a/mysql-test/t/gis.test b/mysql-test/t/gis.test
index 6d7ec046c4c..d578b5c9955 100644
--- a/mysql-test/t/gis.test
+++ b/mysql-test/t/gis.test
@@ -443,7 +443,7 @@ DROP TABLE t1;
 # Bug #30284 spatial key corruption 
 #
 
-create table t1(col1 geometry not null,col15 geometrycollection not
+create table t1(col1 geometry default null,col15 geometrycollection not
 null,spatial index(col15),index(col1(15)))engine=myisam;
 insert into t1 set col15 = GeomFromText('POINT(6 5)');
 insert into t1 set col15 = GeomFromText('POINT(6 5)');