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

Merge bk@192.168.21.1:mysql-4.1-opt 

into  mysql.com:/home/hf/work/30284/my41-30284
parents 366a87cd 140dd4f3

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
@@ -754,4 +754,12 @@ geomdatawkb longblob YES NULL 
drop table t1;

drop table t2;

drop table t3;

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
@@ -458,4 +458,15 @@ drop table t1; 
drop table t2;

drop table t3;



#

# 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