mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 04:53:01 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
into  mysql.com:/home/hf/work/30286/my51-30286


mysql-test/r/gis.result:
  Auto merged
mysql-test/t/gis.test:
  Auto merged
This commit is contained in:
unknown 2007-10-05 16:33:37 +05:00
commit 177d3c3c6a
3 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
mysql-test/r/gis.result
View file

@ -736,6 +736,12 @@ SELECT * FROM t1;
a a
NULL NULL
DROP TABLE t1; 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 End of 4.1 tests
create table t1 (s1 geometry not null,s2 char(100)); 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; create trigger t1_bu before update on t1 for each row set new.s1 = null;

8
mysql-test/t/gis.test
View file

@ -432,6 +432,14 @@ INSERT INTO t1 VALUES (NULL);
SELECT * FROM t1; SELECT * FROM t1;
DROP TABLE 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 --echo End of 4.1 tests
# #

2
sql/gstream.cc
View file

@ -44,7 +44,7 @@ bool Gis_read_stream::get_next_word(LEX_STRING *res)
skip_space(); skip_space();
res->str= (char*) m_cur; res->str= (char*) m_cur;
/* The following will also test for \0 */ /* 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; return 1;
/* /*