From c46e20f6c1275df5890838f92dc070fc7de99f63 Mon Sep 17 00:00:00 2001
From: Dmitry Shulga <Dmitry.Shulga@oracle.com>
Date: Wed, 9 Feb 2011 12:46:12 +0600
Subject: 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.

This follow-up is necessary because on some platforms,
such as Solaris, call to read() from directory may be
successful.
---
 client/readline.cc | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'client/readline.cc')

diff --git a/client/readline.cc b/client/readline.cc
index 7f283502ecb..9ac9ea5824e 100644
--- a/client/readline.cc
+++ b/client/readline.cc
@@ -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_BUFFER *buffer, ulong *out_length);
 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;
-- 
cgit v1.2.1