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

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

into  mysql.com:/home/hf/work/30286/my50-30286
parents b93759b0 39f6cbc2

mysql-test/r/gis.result

+6 −0
Original line number Diff line number Diff line
@@ -736,6 +736,12 @@ SELECT * FROM t1; 
a

NULL

DROP TABLE t1;

CREATE TABLE `t1` ( `col9` set('a'), `col89` date);

INSERT INTO `t1` VALUES ('','0000-00-00');

select geomfromtext(col9,col89) as a 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
@@ -431,6 +431,14 @@ INSERT INTO t1 VALUES (NULL); 
SELECT * FROM t1;

DROP TABLE t1;



#

# Bug #30955 geomfromtext() crasher

#

CREATE TABLE `t1` ( `col9` set('a'), `col89` date);

INSERT INTO `t1` VALUES ('','0000-00-00');

select geomfromtext(col9,col89) as a from t1;

DROP TABLE t1;



--echo End of 4.1 tests



#

sql/gstream.cc

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ bool Gis_read_stream::get_next_word(LEX_STRING *res) 
  skip_space();

  res->str= (char*) m_cur;

  /* The following will also test for \0 */

  if (!my_isvar_start(&my_charset_bin, *m_cur))

  if ((m_cur >= m_limit) || !my_isvar_start(&my_charset_bin, *m_cur))

    return 1;



  /*