From: Nirbhay Choubey
Date: April 27 2011 11:58am
Subject: bzr commit into mysql-5.5 branch (nirbhay.choubey:3471) Bug#12329909
List-Archive: http://lists.mysql.com/commits/136196
X-Bug: 12329909
Message-Id: <201104271158.p3RBwVZl028254@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1035761234=="

--===============1035761234==
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-5.5/ based on revid:magnus.blaudd@stripped

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

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


--===============1035761234==
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\
#   mhfq9j1nc1bkx7tj
# target_branch: file:///home/nirbhay/Project/mysql/repo/bugs/mysql-\
#   5.5/
# testament_sha1: 83611723dc4407c1b7d92975325a46cd82d2002b
# timestamp: 2011-04-27 17:28:17 +0530
# source_branch: file:///home/nirbhay/Project/mysql/repo/bugs/mysql-\
#   5.1.12329909/
# base_revision_id: magnus.blaudd@stripped\
#   9z2oj2md7ohewtsc
# 
# Begin bundle
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
8lIiblStIiB/8XckU4UJDNr6xaA=


--===============1035761234==--