bzr commit into mysql-5.1-mtr branch (bjorn.munch:2946)

[Bjorn Munch]

#At file:///home/bm136801/my/lowcase-51/ based on revid:bjorn.munch@stripped

 2946 Bjorn Munch	2010-10-20
      Fixed wrong feof check in read_line, see 52019

    modified:
      client/mysqltest.cc
=== modified file 'client/mysqltest.cc'
--- a/client/mysqltest.cc	2010-10-20 09:39:58 +0000
+++ b/client/mysqltest.cc	2010-10-20 09:41:51 +0000
@@ -5733,9 +5733,9 @@ int read_line(char *buf, int size)
 
 	for (i= 1; i < charlen; i++)
 	{
+	  c= my_getc(cur_file->file);
 	  if (feof(cur_file->file))
 	    goto found_eof;
-	  c= my_getc(cur_file->file);
 	  *p++ = c;
 	}
 	if (! my_ismbchar(charset_info, mb_start, p))


Attachment: [text/bzr-bundle] bzr/[e-mail]