Local merge from mysql-5.1.

cmd-line-utils/libedit/README

@@ -42,7 +42,7 @@ then merge remaining bits by hand.  All MySQL-specific changes should be
 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.
 

cmd-line-utils/libedit/chared.c

-/*	$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;
 }