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

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

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

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

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


--===============7962829352014262194==
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\
#   62efv51tm3ugeowk
# target_branch: file:///Users/shulga/projects/mysql/mysql-trunk/
# testament_sha1: 13dc3cae289574c7196e9d78c3885e461b866b47
# timestamp: 2011-02-09 17:32:12 +0600
# source_branch: file:///Users/shulga/projects/mysql/mysql-5.5/
# base_revision_id: john.embretsen@stripped\
#   mmuq9b2ifgjxthj2
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWUy7HaYAA/3fgAAQWGP/93ct
iIC////wYAccXwHVc3caZvtw610UKDYJKT1DUnppNiNR6MU2UxDTIBo00MgkpT00J6I9JtNTRqND
EMgNAAAcwAAAAAAAAAAMhFPUyNHoj0nqaTQAANDTI9RkCKlTeptTTKemgm0E0aNBk000NAACKSYg
JqbImJiJmip+iPVHpPEJpo0QotI6/GvbvF4+xtGfOglcxKLN0nVg4EONGQgTwo7Tc80ueNzi/ALY
4tkxsm5QVQpv+SVvcpeVsYsUWLMFStyixFefc2cTPVXeNzIFYauNOXA6gqJQ9uzHUNAgRwFMUCN7
MwVQP5aJrpDOTFSvkrftShhpZI+12lF3b8pZhjuECp/wLA17PU9hOTazQ8n+XsHJx6FH2DLnfMll
nYXvyUTuqdyE0HUlKkpSlLnzwq2wEQsZOFkEmaX8NOjQuSAtzEClgRA2EKB/NKWB85GFZavxhIvo
WUUDcEjCZepgtpP54lmBNo2+aHFljojUjGHOyLuzNJh9cUKCBOYYDy/JsUCqhqEBK1Qo+trumBe4
Ntk9l2HBiglXRrvQ+84OP5ubvJnfi2uKFBNSVlmi7M96tZvCctNNeVJplmk+JKu9oOiEkGV9MMZd
s0sqIHB5+FwgVC2zNnhyhlujLKmups5NCv2shhCwYYMT3aWoMT5hgWT0KJyA7ORfGFqqQOmE+vK0
S6d1jW9Dia0lziy42lNdMH+gr7Bsw2FUyKBqpMHpU+YbIypMCvXIZQlMKKMQRgVIdmpzZBCKFLUC
XYS46QHmLVJSYv7o2gaxCAhYHDm6EGiBQhOeCrt1aqkEAzOvfVGXcaBDwtDYDA1oLaa4sriwzwzR
J9YamQUD8ltLGGgplOwFlTCsxwCHEttWtrvDxKTNomzu5yCO42YSJtoZUJP/jO06TQ2tQLipXI0O
HGeW6RdrH6OIkjAws4aXUKE2Kzq0M2dnH6OWym3bhdwPeueyRPWNwTaFpAAXFlHYom0nCfG4KFMm
O0Nzwk4pxUjC5bGKmMT+ULrC+ooZEZaz18nmyo5jcQ1CTsBsIc2KOYMkspWrQCGTFUtQrVh0f7p8
Nx3HTlEEiA8X8GxXkaBwhVjyRw5OE5zuPH+iXBR/rcOZy1RHKGkPNOfzd+OxQ0Ko6QW36cwe6tYD
wvIDTu1F+AEtbD9nj6oQTLd377QLLVQg6ODpEk5dORCb70hfwMSqDpwboG/FfSfNNltWbttyyESG
ElTra0Od4XQaxylJVZhlnEaDrU7ye2MyUw5SLoJNYsZgt6MfxvhVatuzSSsszJEINiIdG0M204kc
8XXvMXrsbuG0bhN3IxA0Etq38bzBZY8COhpOe2Cl5EfJP1/BNeB9j7kSSCREgglL0Ezbc/19n5mU
9gzVDt6dNLt2p4ybChUraYEdvI5bvmbzlmw+bEtDXah9PoBQ7Fnhmohy7VcbVfe1oa+PA3BUqKXW
KzJU1YYH4miggxoP33Hen+kIA4hr16PUv1PN5JiwHWo4Ygl6so8d9Yayu+4qbRne9WX4Gi1shhsS
DebNg4mdMIp62LuIDJghqHq/nHJV4m0GwJbWQcd4HUS7xU9pBmCtDO0hvZ0GDhWQVvNeMLtd6wdc
S57D4se2BVaDy7poXLTPGv++jxaN6kfFfdSRpzEDG0yo0Q93BD1ex9Q92D5EQfDHpfPkR0OCHMsP
RLnxB8UPU3qbQ3tAfoUbUQgKtSrSES8ted1MzQMsBEmgIGkIOiK1IdBKlDwe4ff8D3IPk1eDle3p
5BV9/lWkQbkNmAXIQ8vORohDcVyYQ0vrYBVjNjmhQlsQqASgCELd7t35dRP4Q/i0odEQuIbb1MWk
wgap/SIWoSQ8pIaUE6vcG12ugzBVYwIART6ixKJeRJtumLiTWSKExoTg3E5SOyH2dqUFT9H7nUPf
jgjRDV93emBSLYMELvAno+j6iWttoQMAsMj5XxvixpY+q2OokH1gohtNYCDM+yDpipYVDOCII6Id
5+CDxTJckMIwNJ+Nl6TYNA1bp/ATc2YebQlNk9/o7B+4eDmZIbEIjh3Kt21CYFj5B1lRRuDSEQVR
I0BsDUFyQF6yoKp3UDsmJU8y25AnDkQxqSwBfaODOFoM+w6xJIWGbwLk1HeGhqXI4x2EBA6EkmQ2
tlTic0yFD3HP/i7kinChIJl2O0w=


--===============7962829352014262194==--