Commit 140dd4f3 authored by holyfoot/hf@mysql.com/hfmain.(none)'s avatar holyfoot/hf@mysql.com/hfmain.(none)
Browse files

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.
parent ea3bfdb2

myisam/mi_check.c

+1 −1
Original line number Diff line number Diff line
@@ -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))

mysql-test/r/gis.result

+8 −0
Original line number Diff line number Diff line
@@ -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

mysql-test/t/gis.test

+11 −0
Original line number Diff line number Diff line
@@ -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