From: Dmitry Shulga
Date: February 8 2011 2:50pm
Subject: bzr commit into mysql-5.1 branch (Dmitry.Shulga:3584) Bug#57450
List-Archive: http://lists.mysql.com/commits/130740
X-Bug: 57450
Message-Id: <201102081451.p18EnpS8009792@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5328064914533367513=="

--===============5328064914533367513==
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.1-bug57450/ based on revid:karen.langford@stripped

 3584 Dmitry Shulga	2011-02-08
      Follow up fix for bug#57450.
      
      batch_readline_init() was modified - return an error
      if the input source is a directory or a block device.

    modified:
      client/mysql.cc
      client/readline.cc
=== modified file 'client/mysql.cc'
--- a/client/mysql.cc	2011-02-05 05:02:00 +0000
+++ b/client/mysql.cc	2011-02-08 14:50:42 +0000
@@ -1131,6 +1131,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:02:00 +0000
+++ b/client/readline.cc	2011-02-08 14:50:42 +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;


--===============5328064914533367513==
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\
#   eb9jvoncqoa466i3
# target_branch: file:///Users/shulga/projects/mysql/mysql-5.1-\
#   bug57450/
# testament_sha1: 1ccc48c150aa6e732fea08ccaac2da58b4d2285b
# timestamp: 2011-02-08 20:50:48 +0600
# base_revision_id: karen.langford@stripped\
#   t04e8k0pwhwtbc1u
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWSMYPdoAAkbfgFAwWef//38v
nKC////0UAVO7PA0LBhIAAJREBDEYk2p6nlPU1NqemaU9NAZNTynqGmNNQOMmTJiMTACZMEyAGjC
MAQwCVPVNPU9U1NinpoaQAAAAAAAB6gaFRoaGgZAaADI0DIAeoAAAkkEATNBACYSMhiQaNG1NAAb
UcQpI8U1bipD+fXhQU1Q4f8SxXegK332OCJWVv9LkUEkEbspoiJCLvWlqUpkKE4GZkZiL1HIDwtH
MMojSIiyEJuKMp41Xyy60w5c0rje5IMx83M8+PC55I36cheKpCVQfFB6j+2Jesnx3aiIpqT+Ze9G
9uhqIe3XJXmxbWM/W945s0VLV3LM2Cq5CcwcUEac9Jb9DOBO91Hwp01JCYEl0MuPOWpkBysUBFhI
e+JWURSG5uvassdE8Q8YhMEEKd0ZxyAmcBtMzQnlCF7iwKkUqyjO2FPsUyVXbsnD40ITg0lXk9C7
qlgmUZq3zMUuvovzsBrcA81oA8tE68iGV7iGujLPdMTGGwqPAJRLzgrYSKjZpeG1WbKyOpA8uNCE
yE4p2l6otMzOyJx26KFmyMLyx95wKi4pGJmcmJA/LB1JJeA4myqnkaq7C4kKyh79iCegDEiJWkgF
VSBEtg5NAwF4rLC7F0wwDDa6ytUG81sV/f4XEFSFJtJ47bzie8pJH0OIxI4jGDY2lbQtLzHXOBfp
4K+oK4WGw2Gc0xcBItW6m8ObUXSvJvQazYQRhQEsOZgOtqmOCRDSVjyezo09BYxHFUGbipZTUszX
hU4hYDhNZQOW0TUgPknqTLAowSxpqwkhGWIKZNB4DOnMme/qRWzFzsJ2NGBTuM9s46ioHi/eFRVX
47bjNP49n+XLi9P7unHr5Onqenzt3s5NnaXUg0fOFydCFpMHhjBcbDEKoilh5qwGhsjKl7h4TJwA
U8TUKWmq4iHk6dzuv7iJBII5gcQ3ExNLyd2Jp9EiROHfCguAWIXPt0rRrNdRR0UCCmHwkRlIpe4D
N7wDoEcqdTKySg1k0haKo63zmBwORQflz0kO0ocwlmRtEq5x4FYaD5aeMCeJo8y3DE02BfCwJyHC
hGSmLjLIq2nNP8HnodxMjI8zcmHes0F1cs6u47TE6RIPmThJzGPs36sThFscNesrNikdxZ8zkzry
UkODLUjoBWaR5r0dpLp1yUKdhfyywrB7sIkljGJmRQs56K8ZkrhrISEVCBBrhGGbMZZRpkxo+G82
Wl8tBrKRfqimV1bCkEkEfTzpzZbRdhqKe8nKj6pxDcjxWAqR+oCYfv5jX9+KG2Wk+dnYHMmBRI/r
BE6J6SK/3cObfqmklapiSPcSOqFL3F1I3qHms6AcV1TesktpIY0o9pSQOQcQ9RejoSgHVRWgSZB1
BVjypHabvGbwKyeAlJcKDGw+ZYI3UZlFFC4HZyf5est0FBXpTBWPi8BhDMOUziLCYBmBlyOe4DIk
q/lmkqEdQOyMBi4r+gl3octYy9T0Y8y7he8UCrUwwQXvISKqPEnzF/31r0PAoNAZgUqwN7rdygkH
W4cjp2dg6cpEX549rlZP3jitWGyOHCYmiwMkNaW7yGX8k7F0mVh3iMitGZAqCvAzPgzN8Q0VjcqQ
tFYS9NI95xTGCYgDxsjIGFrUT4EMsQ6MR12bLitFvAZRBRcDsTYeJ9p2jzfd9y4nU8RLflLEzOaW
knMVglUBcUMVULcd5yKlkaYnvPaPLUbL2XcMhYHgbROMybApFTyPoZH/i7kinChIEYwe7QA=


--===============5328064914533367513==--