Commit ec5051ff authored by unknown's avatar unknown
Browse files

Merge magare.gmz:/home/kgeorge/mysql/work/B27164-4.1-opt 

into  magare.gmz:/home/kgeorge/mysql/work/B27164-5.0-opt


mysql-test/t/gis.test:
  Auto merged
mysql-test/r/gis.result:
  merge 4.1-opt -> 5.0-opt
sql/field.h:
  merge 4.1-opt -> 5.0-opt
parents 43afb278 3335f68d

mysql-test/r/gis.result

+6 −0
Original line number Diff line number Diff line
@@ -730,6 +730,12 @@ point(b, b) IS NULL linestring(b) IS NULL polygon(b) IS NULL multipoint(b) IS NU 
1	1	1	1	1	1	1

0	1	1	1	1	1	1

drop table t1;

CREATE TABLE t1(a POINT) ENGINE=MyISAM;

INSERT INTO t1 VALUES (NULL);

SELECT * FROM t1;

a

NULL

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

+8 −0
Original line number Diff line number Diff line
@@ -423,6 +423,14 @@ from t1; 


drop table t1;



#

# Bug #27164: Crash when mixing InnoDB and MyISAM Geospatial tables

#

CREATE TABLE t1(a POINT) ENGINE=MyISAM;

INSERT INTO t1 VALUES (NULL);

SELECT * FROM t1;

DROP TABLE t1;



--echo End of 4.1 tests



#

sql/field.h

+1 −1
Original line number Diff line number Diff line
@@ -1284,7 +1284,7 @@ class Field_geom :public Field_blob { 
  int  store_decimal(const my_decimal *);

  void get_key_image(char *buff,uint length,imagetype type);

  uint size_of() const { return sizeof(*this); }

  int  reset(void) { return !maybe_null(); }

  int  reset(void) { return !maybe_null() || Field_blob::reset(); }

};

#endif /*HAVE_SPATIAL*/