diff options
| author | Nirbhay Choubey <nirbhay.choubey@oracle.com> | 2011-10-24 13:48:54 +0530 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay.choubey@oracle.com> | 2011-10-24 13:48:54 +0530 |
| commit | 324f3e6a0fa6c162f1861cae000ff325fbba2b22 (patch) | |
| tree | 1579d2c21d56051272198e11e12685cab8cebfaa /cmd-line-utils | |
| parent | a656ff83c822f79806aaaf71d2aca98529db23f9 (diff) | |
| parent | f66002f8eb5747e95721790b30a5e02be6ca6929 (diff) | |
| download | mariadb-git-324f3e6a0fa6c162f1861cae000ff325fbba2b22.tar.gz | |
Local merge from mysql-5.1.
Diffstat (limited to 'cmd-line-utils')
| -rw-r--r-- | cmd-line-utils/libedit/README | 2 | ||||
| -rw-r--r-- | cmd-line-utils/libedit/chared.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cmd-line-utils/libedit/README b/cmd-line-utils/libedit/README index 28041766a2e..c4bc1554b03 100644 --- a/cmd-line-utils/libedit/README +++ b/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. diff --git a/cmd-line-utils/libedit/chared.c b/cmd-line-utils/libedit/chared.c index aba30086b9f..647a5afe439 100644 --- a/cmd-line-utils/libedit/chared.c +++ b/cmd-line-utils/libedit/chared.c @@ -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; } |