summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorunknown <jimw@mysql.com>2005-06-20 15:02:45 -0700
committerunknown <jimw@mysql.com>2005-06-20 15:02:45 -0700
commit3f6501c5e5eb3a793cc7bcafbcfe0abb129693ad (patch)
tree771ab84f683c6b6d523ddedf80755c104e17cca7 /client
parent2bf4fa73de38c2d353a9b1263f80251b4641419a (diff)
parente17de6ecb472e84c7f826f6ac77c236ce952b9a8 (diff)
downloadmariadb-git-3f6501c5e5eb3a793cc7bcafbcfe0abb129693ad.tar.gz
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into mysql.com:/home/jimw/my/mysql-5.0-clean VC++Files/client/mysqlclient.dsp: Auto merged VC++Files/libmysql/libmysql.dsp: Auto merged client/mysql.cc: Auto merged myisam/ft_boolean_search.c: Auto merged mysql-test/r/fulltext.result: Auto merged mysql-test/t/fulltext.test: Auto merged vio/viosocket.c: Auto merged
Diffstat (limited to 'client')
-rw-r--r--client/mysql.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/client/mysql.cc b/client/mysql.cc
index 96b523d8dc8..f98bf467588 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -1011,7 +1011,8 @@ static int read_lines(bool execute_commands)
a nil, it still needs the space in the linebuffer for it. This is,
naturally, undocumented.
*/
- } while (linebuffer[0] <= linebuffer[1] + 1);
+ } while ((unsigned char)linebuffer[0] <=
+ (unsigned char)linebuffer[1] + 1);
line= buffer.c_ptr();
#endif /* __NETWARE__ */
#else