From: Dmitry Shulga
Date: February 9 2011 6:51am
Subject: bzr commit into mysql-5.5 branch (Dmitry.Shulga:3321) Bug#57450
List-Archive: http://lists.mysql.com/commits/130792
X-Bug: 57450
Message-Id: <201102090653.p191prEH003824@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6911934641542509243=="

--===============6911934641542509243==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///Users/shulga/projects/mysql/mysql-5.5/ based on revid:vasil.dimov@stripped

 3321 Dmitry Shulga	2011-02-09 [merge]
      Automerge from mysql-5.1 for follow-up bug#57450.

    modified:
      client/mysql.cc
      client/readline.cc
=== modified file 'client/mysql.cc'
--- a/client/mysql.cc	2011-02-05 05:04:15 +0000
+++ b/client/mysql.cc	2011-02-09 06:50:11 +0000
@@ -1127,6 +1127,8 @@ int main(int argc,char *argv[])
   if (status.batch && !status.line_buff &&
       !(status.line_buff= batch_readline_init(MAX_BATCH_BUFFER_SIZE, stdin)))
   {
+    put_info("Can't initialize batch_readline - may be the input source is "
+             "a directory or a block device.", INFO_ERROR, 0);
     free_defaults(defaults_argv);
     my_end(0);
     exit(1);

=== modified file 'client/readline.cc'
--- a/client/readline.cc	2011-02-05 05:04:15 +0000
+++ b/client/readline.cc	2011-02-09 06:50:11 +0000
@@ -18,6 +18,7 @@
 #include <my_global.h>
 #include <my_sys.h>
 #include <m_string.h>
+#include <my_dir.h>
 #include "my_readline.h"
 
 static bool init_line_buffer(LINE_BUFFER *buffer,File file,ulong size,
@@ -30,6 +31,13 @@ static char *intern_read_line(LINE_BUFFE
 LINE_BUFFER *batch_readline_init(ulong max_size,FILE *file)
 {
   LINE_BUFFER *line_buff;
+  MY_STAT input_file_stat;
+
+  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;
+
   if (!(line_buff=(LINE_BUFFER*)
         my_malloc(sizeof(*line_buff),MYF(MY_WME | MY_ZEROFILL))))
     return 0;


--===============6911934641542509243==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/dmitry.shulga@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: dmitry.shulga@stripped\
#   xcf53n62lwki8mgu
# target_branch: file:///Users/shulga/projects/mysql/mysql-5.5/
# testament_sha1: 0d3bb9c1fb5126ac9ef48082310839253f5ddb1a
# timestamp: 2011-02-09 12:51:37 +0600
# source_branch: file:///Users/shulga/projects/mysql/mysql-5.1-\
#   bug58887/
# base_revision_id: vasil.dimov@stripped\
#   qsmzbrw1gppahx5o
# 
# Begin bundle
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
/4u5IpwoSFTRbgwA


--===============6911934641542509243==--