diff options
| author | unknown <holyfoot/hf@hfmain.(none)> | 2007-10-05 16:33:08 +0500 |
|---|---|---|
| committer | unknown <holyfoot/hf@hfmain.(none)> | 2007-10-05 16:33:08 +0500 |
| commit | 071e55af0db16f3f8d2b703433e8ed8b0edcfa99 (patch) | |
| tree | 1a120ed6b5d577899a2512b84968b4c10dabf9e6 /sql/gstream.cc | |
| parent | c7aff98271c12c652c0a2c0951dfaf8ff3068487 (diff) | |
| parent | 77d786b5a0cd303d30b9a22a044b916078551e6c (diff) | |
| download | mariadb-git-071e55af0db16f3f8d2b703433e8ed8b0edcfa99.tar.gz | |
Merge mysql.com:/home/hf/work/30286/my41-30286
into mysql.com:/home/hf/work/30286/my50-30286
mysql-test/t/gis.test:
Auto merged
sql/gstream.cc:
Auto merged
mysql-test/r/gis.result:
SCCS merged
Diffstat (limited to 'sql/gstream.cc')
| -rw-r--r-- | sql/gstream.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/gstream.cc b/sql/gstream.cc index 46e12b6ef3b..0c8011549f3 100644 --- a/sql/gstream.cc +++ b/sql/gstream.cc @@ -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; /* |