diff options
| author | holyfoot/hf@hfmain.(none) <> | 2007-10-05 16:33:08 +0500 |
|---|---|---|
| committer | holyfoot/hf@hfmain.(none) <> | 2007-10-05 16:33:08 +0500 |
| commit | 1ab2fd9bb8d000d6c9b120dad72ae8999988d380 (patch) | |
| tree | 1a120ed6b5d577899a2512b84968b4c10dabf9e6 /sql/gstream.cc | |
| parent | b93759b01112939aa4118c30abd3bca059e7bad4 (diff) | |
| parent | 39f6cbc221a7b8d88326a6fab41fa1459e8b9dbe (diff) | |
| download | mariadb-git-1ab2fd9bb8d000d6c9b120dad72ae8999988d380.tar.gz | |
Merge mysql.com:/home/hf/work/30286/my41-30286
into mysql.com:/home/hf/work/30286/my50-30286
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; /* |