diff options
| author | unknown <holyfoot/hf@hfmain.(none)> | 2007-10-05 18:53:44 +0500 |
|---|---|---|
| committer | unknown <holyfoot/hf@hfmain.(none)> | 2007-10-05 18:53:44 +0500 |
| commit | d9be8ed9eb4aac435e4006cfad6ed4ab38b5e7d9 (patch) | |
| tree | 5e60779acf827888aa99034240df4f03759c53a6 /sql | |
| parent | a2d88511f0ad0df59bab7da2cf90bb1d6815e357 (diff) | |
| parent | 071e55af0db16f3f8d2b703433e8ed8b0edcfa99 (diff) | |
| download | mariadb-git-d9be8ed9eb4aac435e4006cfad6ed4ab38b5e7d9.tar.gz | |
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into mysql.com:/home/hf/work/30286/my50-30286
Diffstat (limited to 'sql')
| -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; /* |