From: Dmitry Shulga
Date: February 9 2011 11:31am
Subject: bzr push into mysql-5.1 branch (Dmitry.Shulga:3587 to 3588) Bug#57450
List-Archive: http://lists.mysql.com/commits/130847
X-Bug: 57450
Message-Id: <201102091132.p19A9KVC022172@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8559913441598605429=="

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

 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))))


--===============8559913441598605429==
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\
#   d7sd6c5qwofmdrou
# target_branch: file:///Users/shulga/projects/mysql/mysql-5.1-\
#   bug57450/
# testament_sha1: 0a0e2bc63b5e0688ccc9bd235688c8ca9b0273bc
# timestamp: 2011-02-09 17:31:31 +0600
# base_revision_id: john.embretsen@stripped\
#   cl0hropto7r13jq9
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWfEc3FIAAYTfgAAQWGP/91ct
iIC////wUAPZbSixo8bw93hkiAmTETMmNI0NBqZGBPSehAkoCGmjRPRMqHpPaoaGQNAAASiaJqaM
AmU09IAGmjTRiDQ9QMVHoU8lPBENqPU0PUNAGE9RkDQSUpPyanpMAo9E0emSaNqaDagMmgRlvO3X
v+OJXZYC1XTiGcuvZ7cG0Wz5tl2y5RVPfcHF8RehzihaXm2rH7wq3uXj9Ys6OePr35b8hB1r3HBm
YvdTjnrfojm0t8CpCPFYj0V2qgD8YIc86dhosBlcvrGTUMtiPP7BKUk5LNrX7Rgljc1xpPtmWFRD
BL9MLHUkNELCOoIo6JEc0c6LOiR8+qJtlSUQYlLtbCEBICfDK9W2Qpoy0T11XeHyPZPQrc0XKnPv
vx7h5tpmZXzptzaSg/i14jxaiH73W1YoYzynO8Ys2BXHoa1hJTGGDxJJpGSwLXJiQexQrly6dLFp
XSTk8C0ljRA0xZVsBnbf0svG08IuUTKHuwFA4OgwlXJuPD+U/LAwiak3ILR5eVrMWc2HjmSdM6uP
9UeqPW8aRLfgoibgrCox7i6HolXi/kubKGExiCbtDo8wgWO16w1iVlJ/EBXyySoxCQZblhMDhnsi
yLAiEIrNrNWSWXGpBP1tqcKEuPoERPHjzNc5eu72PVTY9NZRyR32l6YWseaIHveix9qO9GLAHDV9
dCRZxhIhaA0d2o4268BC73hi4BUAZst3h3fttyh2yA09nSORlDMvEGIIJNZknZ0VOyTCbsk1IZJI
5WESjM9+zwvjnioiy2LliKES1UHCJUOnNoDFyHMIqkF92m7SIFwlYBr2RZFuZxi2RUUUoqHDhA27
SGwr4wuMzyBiINYb04NCdfSg+Zj+RSC4oYZpXWMemnGbAS8VtxVTDbuYFGulYWHj237kgSAFupZi
CCAW8GVoMEV8xrWgH5IdziVdijMYJMpDKUyFG7FMsjfcGu5wNLJmg8HSxxfXTY6AMwi2BkovEZny
QW1YYnWrejPWG+LU9aQvmCQmaG0cRJDCq9BmGzBPtxG8zIPSN3LBaihrifQmltKVlhuefudKwgme
RmCUXRQFNj5yHrBMmBSKLus1WyvB4H6zgFogZYMEBI8CRQBMRfMbHA3WV6C4U8qRYfjMJQxg49OY
DTCiBLzdNsNxYk+uN408kSHGvsyhpQUiMk9XUcAXveggAtGRWppsA+0H0cazbVsJsoAneas2K56T
QBFZan4NgPWssyP3D6HnPAct3ROaEyhmRVmQIUIyNpNMEe5cNLG2lxqSL6lPRUTqgJZSTLabPAVN
e5sO8QGUWICKC3jxYB1etn/xdyRThQkPEc3FIA==


--===============8559913441598605429==--