From: Nirbhay Choubey
Date: April 27 2011 12:00pm
Subject: bzr commit into mysql-trunk branch (nirbhay.choubey:3329) Bug#12329909
List-Archive: http://lists.mysql.com/commits/136197
X-Bug: 12329909
Message-Id: <201104271201.p3RC1DbS024077@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2068542448=="

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

#At file:///home/nirbhay/Project/mysql/repo/bugs/mysql-trunk/ based on revid:magnus.blaudd@stripped

 3329 Nirbhay Choubey	2011-04-27 [merge]
      Merge of fix for bug#12329909 from mysql-5.5 -> mysql-trunk.

    modified:
      cmd-line-utils/libedit/vi.c
=== modified file 'cmd-line-utils/libedit/vi.c'
--- a/cmd-line-utils/libedit/vi.c	2010-10-19 22:51:34 +0000
+++ b/cmd-line-utils/libedit/vi.c	2011-04-27 11:57:51 +0000
@@ -1012,8 +1012,10 @@ vi_histedit(EditLine *el, int c __attrib
 	if (fd < 0)
 		return CC_ERROR;
 	cp = el->el_line.buffer;
-	write(fd, cp, el->el_line.lastchar - cp +0u);
-	write(fd, "\n", 1);
+	if (write(fd, cp, el->el_line.lastchar - cp +0u) == -1)
+          goto error;
+	if (write(fd, "\n", 1) == -1)
+          goto error;
 	pid = fork();
 	switch (pid) {
 	case -1:
@@ -1041,6 +1043,12 @@ vi_histedit(EditLine *el, int c __attrib
 	unlink(tempfile);
 	/* return CC_REFRESH; */
 	return ed_newline(el, 0);
+
+/* XXXMYSQL: Avoid compiler warnings. */
+error:
+        close(fd);
+        unlink(tempfile);
+        return CC_ERROR;
 }
 
 /* vi_history_word():


--===============2068542448==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/nirbhay.choubey@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: nirbhay.choubey@stripped\
#   7ub5ddh617pj13ht
# target_branch: file:///home/nirbhay/Project/mysql/repo/bugs/mysql-\
#   trunk/
# testament_sha1: f4957c3c4d1b6a9e432d989b38efe26725975c8f
# timestamp: 2011-04-27 17:30:59 +0530
# source_branch: file:///home/nirbhay/Project/mysql/repo/bugs/mysql-\
#   5.5/
# base_revision_id: magnus.blaudd@stripped\
#   oph0wpcvwpb94nrv
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWaw8+A4ABHVfgEU4WH///3/n
/uS////wYAgPvZmgAoFPrrQrVNVRQBCUkNT0JqNGjMk8U2mp6hppo9I2po0A00NDTQBwDCMJpiGA
QDIAYRpkyYRgIaHAMIwmmIYBAMgBhGmTJhGAhoMgSpp5J+qeieo0GgAAA0A0AAAAIpUyaptlNPRp
PIaU9Qyb0gQeoABoyaDEZGCKSaACDQCZDSZTTSae1T9RGNQGmjIA/KmncxCsSw3MZJeRYoj0fh5m
o9Ccr3XZ6ICMsGzNOg07vP52X1fhAFUeUIXeU7rC/TW75asGbi8FSS+Nn9DL/OkfGwJU6Q8cZ1Ko
EQ++URdZzAVJsLdxbiQiqVmlcK0+LXW/UiJcJYcTIGQOo8Cm99G4NPGh9uvbL43gGTHEaXktDDUY
SYfBirDY0KQNJBAKFrJTWJj+G03eW0t8knPx+E0ehkYpPTB4Hu/Ye1FW/41kt0fRQm1OIgeqeazJ
ebmWFO5ocOlOSHq0OtO5vK+SdgnjCbgnTDFVyxAKACQINgggSyGLam9WLGJKSqqrg92z4+doOUaF
Y0UiZsEpkgA80ksja8GViT+iQVOmiaAUVpUUSKY7AsaomfHGoJjG9KIbFroCigLL2TdP5djg6U0x
6QBq/SSkhRp0HVvEyddjIjQAEHaPdiHBqACm9QklL21swx+QRUd8446s3c/w1OqnmF1gFT2Bb7nQ
2b7hMYQsOfrhvTaGukJ50putSDPd+nENlpUcGHZa4wFRfj2ifDca75JwQrw7MjfR0TIIECRvaMHk
W0JY9kth0L5l2AAefdsS55p0TE5ZIb+XO32OykOwL9hxbn4tiS36NOeoklLPjoqKdyVdOE0mzqpY
oai6p0hFKF2qKNmrAp2mIcIsQgDHGsSi5AJmglYzkEZZbbJhlOQXMyT76Uy0XSNdd7YW1Hf0SKpv
WCGtBsKzFAIfPF2ss6OC2GaoIDnJU23FCP+sHDN63VUbwq17Nd+EY3fSJxTlhoqldbgG/uCipKK7
7NoWBlt4Rr5Wxva7hhLt9k7uJZoGoSoo3VuDJugboVJ3S7tDNDhY1hszCy79WpkBaGzDjsz032MB
3JIuS9DoHJM79mgi5YY3hCakq5Qbpmqjxrtu4a+VtOtlISNbskHwcNLqkQQVhA0zvaUkFBhqOTyx
nTlC1pF1Rbkxqk1a4nnmGgMuqG53cM6JlQKRaVjUVswXDBWmZFIMlBcBCHh1BFTSBVJm0MqElWhT
Uw2n+vtPFNz9Z9L2GR2cogaCo+d9DaejFp5Ng+Yj+JldeShhhIiPyPyPeUl6PxCaSQ/JsXH/5yjo
P6HKE5eOgnDrDrcZSQQeusoIe/1C4/F9Z7ZGR7N5cVEBtGwmGBHs9ePHwS6NIhnMauxwHqauZYFS
jfxU4ukyuN1ZqkECzlzJtBND6h/M+/M+s4nBreBt84/jpR/kYc8gypk0DgcS1F3bK5Q0Bm9/2Dk+
DNUUs30o3CpnRcqLMhalg4H3no8nkpSuYWb0M/DxDw116CO9479ctOk70w8Q6G7Pnjm8Ot5UI7tO
iphkiH/NPIrRCTY3HRp1Wl1JKhvOvZudweNQa7go4hcF40eFwF7tKW61eo9MzAKeA/ZSGIVpw0SD
aknIx8cmv8NhYWZmopNKaTNBfMMIhEGTez3eJx/fk2inKSy3zVNgiOGpO+ig4mjCIIdbLU2obPfz
xoJnP5+Ug61N3DV4eROzBLUMLaRZ1WSROBlt6ujJH202I1+6OIKdJsCGBAUBJcu1PxPcHHMubNbI
Tqt7tIU73gmC9HvYEZoxHigJiZBRQoIYpm7q2r8tDGR1l7rsXslJxjhPAJZQx9jnX2kXp0IGTwQk
SZkz4Fv0PzPeSR1kn4NA+pZwcnrxCjxE0y6ovaVJrmd79KeCFono0iNzkDGcBmWDhEjC7TFFhwMV
uLm1sLDgTYfY3pX1Q4xShxzQxDVfKiyVHl1eTW2nFT8G0RsUpdsK3Qm6JoyHPQVYUrDiQtZAnT9k
5iIK4lSnk80JsxJ9UK07YIBxUxZM0gfaHekHPqChEIXZP14L2dp8elgqcFJOwymtpsVDIea2fFgr
JhaOhDz7W1qakuo5HjOCIi3CkqiR+chxYSsmeiFzqILUIgqYXJ9K956EZJBIiQQSl8zXcdBIlm6h
ZQBtGSHu7yOWOYeh1WMpagmAmhTjZZIa2JyHtRDZQkW68h28dJ84AYnc7lx4MEIdwzT3FobBKJMb
Q8NHLuquZ2laa0P0GS2WEdjUQ8k4JSgNryRdBYj8szQ+LJLx0+W0MFzbnlsKqw5to2VHayQo5nO8
ZNW8IaWrSO1hwJibFJFQcYIgj6hPA9xBZ9q2rsoE5p3lEYGbFDrKD7g1hSEmqrz0vINrOSQ7d7g5
D4GhD3purNKGoTgXc2gDN2P3JxTafZiJkGKLlrHYXp4EnuTSdc+DrG02Zk0rdmAmTwNKXIXHMvTp
gp8qBLuL5CbTD5tadE1JzJvJqO0ybtySMSGhDAooEqbco2yCMrIwI0Nyzm4a2+ne26HEJK9wu5Ip
woSFYefAcA==


--===============2068542448==--