From: Nirbhay Choubey
Date: October 24 2011 8:23am
Subject: bzr push into mysql-trunk branch (nirbhay.choubey:3526 to 3527)
List-Archive: http://lists.mysql.com/commits/141562
Message-Id: <201110240824.p9O8O4aH003373@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3527 Nirbhay Choubey	2011-10-24 [merge]
      Local merge from mysql-5.5.

    modified:
      cmd-line-utils/libedit/README
      cmd-line-utils/libedit/chared.c
 3526 Dmitry Lenev	2011-10-24 [merge]
      Merge of fix for bug #13116518 "OPEN_TABLES() SHOULD NOT ALLOCATE
      AND FREE NEW_FRM_MEM WITHOUT NEEDING TO".

    modified:
      sql/sql_base.cc
=== modified file 'cmd-line-utils/libedit/README'
--- a/cmd-line-utils/libedit/README	2011-10-13 19:33:25 +0000
+++ b/cmd-line-utils/libedit/README	2011-10-24 08:05:28 +0000
@@ -42,7 +42,7 @@ then merge remaining bits by hand.  All 
 marked with XXXMYSQL to make them easier to identify and merge.  To generate
 a 'clean' diff against upstream you can use the above commands but use
 
-	cvs co -D "2011/10/04 15:27:04" [..]
+	cvs co -D "2011/10/23 17:37:55" [..]
 
 to fetch the baseline of most recent merge.
 

=== modified file 'cmd-line-utils/libedit/chared.c'
--- a/cmd-line-utils/libedit/chared.c	2011-10-13 19:33:25 +0000
+++ b/cmd-line-utils/libedit/chared.c	2011-10-24 08:05:28 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: chared.c,v 1.35 2011/08/16 16:25:15 christos Exp $	*/
+/*	$NetBSD: chared.c,v 1.36 2011/10/23 17:37:55 christos Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -200,7 +200,7 @@ c_delbefore1(EditLine *el)
 protected int
 ce__isword(Int p)
 {
-	return Isalnum(p || Strchr(STR("*?_-.[]~="), p) != NULL);
+        return Isalnum(p) || Strchr(STR("*?_-.[]~="), p) != NULL;
 }
 
 

No bundle (reason: useless for push emails).