diff options
| author | gluh@eagle.(none) <> | 2007-10-23 18:51:43 +0500 |
|---|---|---|
| committer | gluh@eagle.(none) <> | 2007-10-23 18:51:43 +0500 |
| commit | 237383f0fecd267d702b92713d49b0f9b2c78746 (patch) | |
| tree | d36465f86e78c442a44942849b7280eab8d10bf8 /sql/gstream.cc | |
| parent | 9732efe7f8970626840cf64628ab75f83eee5523 (diff) | |
| parent | d0f53297f6acffecb75845fdc03df35c6956efbc (diff) | |
| download | mariadb-git-237383f0fecd267d702b92713d49b0f9b2c78746.tar.gz | |
Merge mysql.com:/home/gluh/MySQL/Merge/5.0
into mysql.com:/home/gluh/MySQL/Merge/5.0-opt
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; /* |