bzr push into mysql-5.1 branch (Dmitry.Shulga:3587 to 3588) Bug#57450

[Dmitry Shulga]

 3588 Dmitry Shulga	2011-02-09
      Follow up fix for bug#57450.
      
      batch_readline_init() was modified - make check for 
      type of file for input stream unless target platform
      is WINDOWS since on this platform S_IFBLK is undefined.

    modified:
      client/readline.cc
 3587 John H. Embretsen	2011-02-09 [merge]
      Null merge from mysql-5.0

=== modified file 'client/readline.cc'
--- a/client/readline.cc	2011-02-09 06:46:12 +0000
+++ b/client/readline.cc	2011-02-09 11:13:17 +0000
@@ -33,10 +33,12 @@ LINE_BUFFER *batch_readline_init(ulong m
   LINE_BUFFER *line_buff;
   MY_STAT input_file_stat;
 
+#ifndef __WIN__
   if (my_fstat(fileno(file), &input_file_stat, MYF(MY_WME)) ||
       MY_S_ISDIR(input_file_stat.st_mode) ||
       MY_S_ISBLK(input_file_stat.st_mode))
     return 0;
+#endif
 
   if (!(line_buff=(LINE_BUFFER*)
         my_malloc(sizeof(*line_buff),MYF(MY_WME | MY_ZEROFILL))))


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