From: Dmitry Shulga
Date: February 9 2011 11:32am
Subject: bzr push into mysql-5.5 branch (Dmitry.Shulga:3322 to 3323) Bug#57450
List-Archive: http://lists.mysql.com/commits/130848
X-Bug: 57450
Message-Id: <201102091133.p19B2orf029265@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7056191040636667458=="

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

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

    modified:
      client/readline.cc
 3322 John H. Embretsen	2011-02-09 [merge]
      Null merge from mysql-5.1

=== modified file 'client/readline.cc'
--- a/client/readline.cc	2011-02-09 06:50:11 +0000
+++ b/client/readline.cc	2011-02-09 11:16:33 +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))))


--===============7056191040636667458==
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\
#   l1umznsnj5wqr0es
# target_branch: file:///Users/shulga/projects/mysql/mysql-5.5/
# testament_sha1: 2cb7d3b9a3b7015e0adc9f5599ae1071f8018542
# timestamp: 2011-02-09 17:32:25 +0600
# source_branch: file:///Users/shulga/projects/mysql/mysql-5.1-\
#   bug58887/
# base_revision_id: john.embretsen@stripped\
#   uxsch8cz9zj9wc6k
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWZU+oakAAwPfgAAQWGP/93ct
iIC////wUAYY3gpoB3MAAAGGKozSNGg0aNBoBoAAGIZBJVNkmT1NJtqT9U2hA3pT0manqHqZDIAE
qniahTymGBqIAAA00ZNNqHqDmAAAAAAAAAABJIBATENGgJkRkyTKfppQ09DUm4Lw7PKrZuMDeWWW
6VJEWNr5wKUAjKjaNLk8H+YDy3ZsmqJqjBQVJE3bCTCEBxBEtzswqVQUrRX1leJHiqw2sgrb8aHa
cW6XX208MSYlUudQ2szBoWbHoza3GopKiLtU1wmtkEfBWP112yZAdmAWE+0+K6SwRuJEBfo7Bmae
S8gs0pAdY6Z0AC6NwoCDIc6LnO00qkKbCawreziCJ56uBREgntATknMAv1CDwapvbImPQLIKikPQ
CpFZDzsH1kCJPqLROsxSLGvo1OxAgH2sFEBPCsN/0HoFEAiAQImNFQm+yWW0aoRJYLWl+DP1LzWQ
2VlScKUQ8hTVblpxbglHml1AMKG5HkMdTA5xUTzzV2RAWw4aYgKTrSvayji1uGBZtUNVpuw1DG9i
GbkqVkcjmENDCeF2CxFGAQ48ZiKQo9VCzHto2uZmHrnkxB6J8jhYINSsKIXkFRL5MtRSI8uW5gQK
6arSQX62GctqeXPmcYfO/iSkSvIHPqxsMI/cs4cKhXBtyr5/UzETDUHgDB/YtWde15obn9IKXi4W
ZjxoVajKs5AYj0cGEXF8iU1iHEjDUIz1b3A2otrdAmrojj9l8zSAsCQqEiVpj3zhbrcUy+6sEPKy
t+D3mY1IkC8nu81dhhVmfKlz8m1g8vGEiZfGLsjuSCqASHqG/PZNpjazsxTdkW5ajOs/ZaNi/Hmu
CdgXhRiScXAPGLxol4DgfGJATEhpBNKUhjWfUPUoajjuZnDBzPg+p2JCYQYXHUgiElNN+bEgZ9py
UCfS2J2oDyCcoXxPNPiEWAS7jgYG862C3RJDuusIzgjYwmr9PYQmrbe8DK8wpWXywIEpsoEM5TrP
eSGMIvV+akz4oXW+MzTA8dtLxdD/dSC8W4sLr7OgjobVhIw4yNb8ihV5CuNnGnP4/MDguXXSu15o
nCExcIXEmF6mbhuFht22L3uKZ4IoI17ywWIiciZQW6zMbiPfqYmRbqH5+CCWZ7n4Gchhwzuwi4nd
+fJedsLhQBLv2wnliMO0iRkVHfkZ5eZrOhvXgM7EywS9PQCJ4D9MJ8/E2HYzc5d9CZHS4u3ON+/+
x4XCmL/mJrD/omFfw0OFOp1NqKxuMg42CVQnktXhwD5+HU9evWK7Rf8nBAfYj8n0+gxe14iPi9GI
ytGY8T1bMSNuCBnhtyS4AUdX5kgvForA+5UIGMhUWRyvMj2PuJjSwoeAu9RFKAbr4JTSjdXL/3Az
IlQDe0vIBxhoArJlsBeSrF6L1PsHNeybruIaG1LyHngprkByF3MgLwyIgehFTEJg19xItCBqSw4H
ckWBPIhJhC4vRcLeIiR3F4fL4C8QcSRZQoHIPlzjAxFbRTExn0cYCYoSsGSwqk8CQ2g2gouuFIE5
hMKfdYbLeQj+RfzOPEQqMTqAsIwBkSD/BCmk5Lo4WMRHIwNRiKIXbhhhQD9QIFc/cmRXhrR5kyxb
RUBTDe47i91oEUAfwfByD57qxERYnzNgVxabFaVNIYnZeIiZOYwMCGHHWptjPUXnik8yEfw6IsEZ
F57iDGwB5IL2G4C2nwMc1ai1KtqzGHN9QQGMQyKQ/AQLyAeBEcxt7Fwb1dYlaJmuEiV4niecw41o
w9g7hEM4o6LuHQQup+BbTo2Wz9wW4NYtgGGAaiv4VA09DyETFtN/2Jys9g5K8XIPQYAOUhhvDeYH
i+YWAujcMn8XckU4UJCVPqGp


--===============7056191040636667458==--