diff options
| author | Vasil Dimov <vasil.dimov@oracle.com> | 2011-11-18 13:57:10 +0200 |
|---|---|---|
| committer | Vasil Dimov <vasil.dimov@oracle.com> | 2011-11-18 13:57:10 +0200 |
| commit | 63e381e98d010e0049bff2ff99c091b8806e6bc2 (patch) | |
| tree | f3f8ea7bb7510cef24661dbccde636d875dccdb7 /cmd-line-utils/libedit/np/vis.c | |
| parent | 1f8efaccd442af8e08a8f663893f4aee6dbbfefb (diff) | |
| parent | e1df69f75ac478b0456bc768b61dfd412fa510e9 (diff) | |
| download | mariadb-git-63e381e98d010e0049bff2ff99c091b8806e6bc2.tar.gz | |
Merge mysql-5.1 -> mysql-5.5
I manually checked that all the conflicting InnoDB changes are in 5.5 already.
Two things I am not sure about - I commented them with XXX in this patch.
I will further check with the authors of the changesets whether these things
should be present or not.
Diffstat (limited to 'cmd-line-utils/libedit/np/vis.c')
| -rw-r--r-- | cmd-line-utils/libedit/np/vis.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cmd-line-utils/libedit/np/vis.c b/cmd-line-utils/libedit/np/vis.c index 6c75438c352..d7cc37b4f47 100644 --- a/cmd-line-utils/libedit/np/vis.c +++ b/cmd-line-utils/libedit/np/vis.c @@ -68,11 +68,11 @@ #include <sys/types.h> #include <assert.h> -#ifdef HAVE_VIS_H -#include <vis.h> -#else +/* + XXXMYSQL : Due to different versions of vis.h available, + use the one bundled with libedit. +*/ #include "np/vis.h" -#endif #include <errno.h> #include <stdlib.h> |