From: Dmitry Shulga
Date: February 9 2011 6:57am
Subject: bzr commit into mysql-trunk branch (Dmitry.Shulga:3620)
List-Archive: http://lists.mysql.com/commits/130874
Message-Id: <201102090659.p195DrKS019808@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4169035310158023389=="

--===============4169035310158023389==
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-trunk/ based on revid:georgi.kodinov@stripped

 3620 Dmitry Shulga	2011-02-09 [merge]
      Automerge from mysql-5.5

    modified:
      client/mysql.cc
      client/readline.cc
=== modified file 'client/mysql.cc'
--- a/client/mysql.cc	2011-02-05 05:06:29 +0000
+++ b/client/mysql.cc	2011-02-09 06:56:59 +0000
@@ -1128,6 +1128,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;


--===============4169035310158023389==
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\
#   g5oom6ou4a4d8j77
# target_branch: file:///Users/shulga/projects/mysql/mysql-trunk/
# testament_sha1: cdcc61773f2658f3d23777bf755900bef8735905
# timestamp: 2011-02-09 12:57:56 +0600
# source_branch: file:///Users/shulga/projects/mysql/mysql-5.5/
# base_revision_id: georgi.kodinov@stripped\
#   62ki0jsru3v8ecns
# 
# Begin bundle
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


--===============4169035310158023389==--