From: Nirbhay Choubey Date: October 21 2011 1:02pm Subject: bzr push into mysql-5.1 branch (nirbhay.choubey:3630 to 3631) Bug#13106585 WL#5945 List-Archive: http://lists.mysql.com/commits/141540 X-Bug: 13106585 Message-Id: <201110211302.p9LD2HUf018114@acsmt356.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3631 Nirbhay Choubey 2011-10-21 Bug#13106585 PUSH FOR "WL#5945 : IMPROVE LIBEDIT LIBRARY" BREAKS SOURCE RELEASE BUILD Some of the required files were not getting copied while performing 'make dist' and hence the build failed for the created distribution source. Added the missing files to Makefile.am. modified: cmd-line-utils/libedit/Makefile.am cmd-line-utils/libedit/chartype.c cmd-line-utils/libedit/histedit.h cmd-line-utils/libedit/refresh.c cmd-line-utils/libedit/sys.h cmd-line-utils/libedit/terminal.c 3630 Sergey Vojtovich 2011-10-21 [merge] Merge. modified: mysql-test/r/myisam.result mysql-test/t/myisam.test storage/myisam/ha_myisam.cc storage/myisam/mi_delete_all.c === modified file 'cmd-line-utils/libedit/Makefile.am' --- a/cmd-line-utils/libedit/Makefile.am 2011-10-13 19:33:25 +0000 +++ b/cmd-line-utils/libedit/Makefile.am 2011-10-21 12:40:12 +0000 @@ -7,8 +7,8 @@ INCLUDES = -I$(top_builddir)/include -I noinst_LIBRARIES = libedit.a -libedit_a_SOURCES = chared.c el.c eln.c history.c historyn.c map.c prompt.c readline.c \ - search.c tokenizer.c tokenizern.c vi.c common.c emacs.c \ +libedit_a_SOURCES = chared.c el.c eln.c history.c historyn.c map.c prompt.c chartype.c \ + readline.c search.c tokenizer.c tokenizern.c vi.c common.c emacs.c \ hist.c keymacro.c parse.c read.c refresh.c sig.c terminal.c \ tty.c help.c fcns.c filecomplete.c \ np/unvis.c np/strlcpy.c np/vis.c np/strlcat.c \ @@ -19,8 +19,8 @@ libedit_a_DEPENDENCIES = @LIBEDIT_LOBJ pkginclude_HEADERS = readline/readline.h -noinst_HEADERS = chared.h el.h el_terminal.h histedit.h keymacro.h parse.h refresh.h sig.h \ - sys.h config.h hist.h map.h prompt.h read.h \ +noinst_HEADERS = chared.h chartype.h el.h el_terminal.h histedit.h keymacro.h parse.h \ + refresh.h sig.h sys.h config.h hist.h map.h prompt.h read.h \ search.h tty.h filecomplete.h np/vis.h EXTRA_DIST = makelist.sh @@ -74,6 +74,7 @@ eln.o: vi.h emacs.h common.h help.h fcns history.o: vi.h emacs.h common.h help.h fcns.h historyn.o: vi.h emacs.h common.h help.h fcns.h map.o: vi.h emacs.h common.h help.h fcns.h +chartype.o: vi.h emacs.h common.h help.h fcns.h prompt.o: vi.h emacs.h common.h help.h fcns.h readline.o: vi.h emacs.h common.h help.h fcns.h search.o: vi.h emacs.h common.h help.h fcns.h === modified file 'cmd-line-utils/libedit/chartype.c' --- a/cmd-line-utils/libedit/chartype.c 2011-10-13 19:33:25 +0000 +++ b/cmd-line-utils/libedit/chartype.c 2011-10-21 12:40:12 +0000 @@ -258,9 +258,6 @@ out: return NULL; } -#ifdef WIDECHAR -int wcwidth(wchar_t wc); // Signature. -#endif protected int ct_visual_width(Char c) === modified file 'cmd-line-utils/libedit/histedit.h' --- a/cmd-line-utils/libedit/histedit.h 2011-10-13 19:33:25 +0000 +++ b/cmd-line-utils/libedit/histedit.h 2011-10-21 12:40:12 +0000 @@ -247,15 +247,6 @@ int tok_str(Tokenizer *, const char *, /* * Begin Wide Character Support */ -#ifdef __linux__ -/* Apparently we need _GNU_SOURCE defined to get access to wcsdup on Linux */ -#ifndef _GNU_SOURCE -#define _GNU_SOURCE -#endif -#endif - -#include -#include /* * Wide character versions === modified file 'cmd-line-utils/libedit/refresh.c' --- a/cmd-line-utils/libedit/refresh.c 2011-10-13 19:33:25 +0000 +++ b/cmd-line-utils/libedit/refresh.c 2011-10-21 12:40:12 +0000 @@ -40,8 +40,6 @@ static char sccsid[] = "@(#)refresh.c 8. #endif #endif /* not lint && not SCCSID */ -#include "chartype.c" /* XXXMYSQL */ - /* * refresh.c: Lower level screen refreshing functions */ === modified file 'cmd-line-utils/libedit/sys.h' --- a/cmd-line-utils/libedit/sys.h 2011-10-13 19:33:25 +0000 +++ b/cmd-line-utils/libedit/sys.h 2011-10-21 12:40:12 +0000 @@ -92,8 +92,21 @@ size_t strlcpy(char *dst, const char *sr char *fgetln(FILE *fp, size_t *len); #endif -#ifndef HAVE_WCSDUP +#ifdef __linux__ +/* Apparently we need _GNU_SOURCE defined to get access to wcsdup on Linux */ +#ifndef _GNU_SOURCE +#define _GNU_SOURCE +#endif +#endif + +#ifndef __USE_XOPEN +#define __USE_XOPEN +#endif + #include +#include + +#ifndef HAVE_WCSDUP wchar_t *wcsdup(const wchar_t *); #endif === modified file 'cmd-line-utils/libedit/terminal.c' --- a/cmd-line-utils/libedit/terminal.c 2011-10-13 19:33:25 +0000 +++ b/cmd-line-utils/libedit/terminal.c 2011-10-21 12:40:12 +0000 @@ -636,9 +636,6 @@ mc_again: el->el_cursor.h = where; /* now where is here */ } -#ifdef WIDECHAR -int wcwidth(wchar_t); // Signature. -#endif /* terminal_overwrite(): * Overstrike num characters No bundle (reason: useless for push emails).