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

Merge mysql.com:/home/hf/work/30284/my41-30284 

into  mysql.com:/home/hf/work/30284/my50-30284
parents 7b38492a 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
@@ -742,6 +742,14 @@ 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

create table t1 (s1 geometry not null,s2 char(100));

create trigger t1_bu before update on t1 for each row set new.s1 = null;

mysql-test/t/gis.test

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



#