Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1 (8368559f) · Commits · Software / OSDI20 Artifacts / mariadb

.bzrignore

+1 −1

Original line number	Diff line number	Diff line
		@@ -258,7 +258,7 @@ cmd-line-utils/libedit/common.h
		cmd-line-utils/libedit/makelist
		comon.h
		config.cache
		config.h
		./config.h
		config.h.in
		config.log
		config.status

acinclude.m4

+24 −0

Original line number	Diff line number	Diff line
		# Local macros for automake & autoconf


		AC_DEFUN(MYSQL_CHECK_READLINE_DECLARES_HIST_ENTRY,[
		AC_CACHE_CHECK([HIST_ENTRY is declared in readline/readline.h], mysql_cv_hist_entry_declared,
		AC_TRY_COMPILE(
		[
		#include "stdio.h"
		#undef __P // readline-4.2 declares own __P
		#include "readline/readline.h"
		],
		[
		HIST_ENTRY entry;
		],
		[
		mysql_cv_hist_entry_declared=yes
		AC_DEFINE_UNQUOTED(HAVE_HIST_ENTRY, [1],
		[HIST_ENTRY is defined in the outer libeditreadline])
		],
		[mysql_cv_libedit_interface=no]
		)
		)
		])

		AC_DEFUN(MYSQL_CHECK_LIBEDIT_INTERFACE,[
		AC_CACHE_CHECK([libedit variant of rl_completion_entry_function], mysql_cv_libedit_interface,
		AC_TRY_COMPILE(
		[
		#include "stdio.h"
		#undef __P // readline-4.2 declares own __P
		#include "readline/readline.h"
		],
		[
		@@ -26,6 +49,7 @@ AC_DEFUN(MYSQL_CHECK_NEW_RL_INTERFACE,[
		AC_TRY_COMPILE(
		[
		#include "stdio.h"
		#undef __P // readline-4.2 declares own __P
		#include "readline/readline.h"
		],
		[

client/mysql.cc

+2 −1

Original line number	Diff line number	Diff line
		@@ -84,6 +84,7 @@ extern "C" {
		#if defined( __WIN__) \|\| defined(OS2)
		#include <conio.h>
		#elif !defined(__NETWARE__)
		#undef __P // readline-4.2 declares own __P
		#include <readline/readline.h>
		#define HAVE_READLINE
		#endif
		@@ -294,7 +295,7 @@ static const char *server_default_groups[]=
		HIST_ENTRY is defined for libedit, but not for the real readline
		Need to redefine it for real readline to find it
		*/
		#if !defined(USE_LIBEDIT_INTERFACE)
		#if !defined(HAVE_HIST_ENTRY)
		typedef struct _hist_entry {
		const char *line;
		const char *data;

cmd-line-utils/Makefile.am

+17 −0

Original line number	Diff line number	Diff line
		# Copyright (C) 2004 MySQL AB
		#
		# This library is free software; you can redistribute it and/or
		# modify it under the terms of the GNU Library General Public
		# License as published by the Free Software Foundation; either
		# version 2 of the License, or (at your option) any later version.
		#
		# This library is distributed in the hope that it will be useful,
		# but WITHOUT ANY WARRANTY; without even the implied warranty of
		# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
		# Library General Public License for more details.
		#
		# You should have received a copy of the GNU Library General Public
		# License along with this library; if not, write to the Free
		# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
		# MA 02111-1307, USA

		## Process this file with automake to create Makefile.in

		SUBDIRS= @readline_basedir@

cmd-line-utils/libedit/Makefile.am

+17 −17

Original line number	Diff line number	Diff line
		@@ -7,28 +7,30 @@ AHDR=vi.h emacs.h common.h

		INCLUDES = -I$(top_srcdir)/include -I$(srcdir)/../.. -I..

		noinst_LIBRARIES = liblibedit.a
		noinst_LIBRARIES = libedit.a

		liblibedit_a_SOURCES = chared.c el.c fgetln.c history.c map.c \
		prompt.c readline.c search.c \
		strlcpy.c tokenizer.c vi.c common.c \
		emacs.c hist.c key.c parse.c read.c \
		refresh.c sig.c term.c tty.c help.c \
		fcns.c
		libedit_a_SOURCES = chared.c el.c history.c map.c prompt.c readline.c \
		search.c tokenizer.c vi.c common.c emacs.c \
		hist.c key.c parse.c read.c refresh.c sig.c term.c \
		tty.c help.c fcns.c

		EXTRA_libedit_a_SOURCES = np/unvis.c np/strlcpy.c np/vis.c np/strlcat.c \
		np/fgetln.c

		libedit_a_LIBADD = @LIBEDIT_LOBJECTS@
		libedit_a_DEPENDENCIES = @LIBEDIT_LOBJECTS@

		pkginclude_HEADERS = readline/readline.h

		noinst_HEADERS = chared.h el.h histedit.h key.h \
		parse.h refresh.h sig.h sys.h \
		tokenizer.h compat.h compat_conf.h fgetln.h \
		hist.h map.h prompt.h search.h \
		strlcpy.h libedit_term.h tty.h
		noinst_HEADERS = chared.h el.h histedit.h key.h parse.h refresh.h sig.h \
		sys.h tokenizer.h config.h hist.h map.h prompt.h \
		search.h tty.h

		EXTRA_DIST = makelist.sh
		EXTRA_DIST = makelist.sh np/unvis.c np/strlcpy.c np/vis.c np/strlcat.c np/fgetln.c

		CLEANFILES = makelist
		CLEANFILES = makelist common.h emacs.h vi.h fcns.h help.h fcns.c help.c

		DEFS = -DUNDEF_THREADS_HACK -DHAVE_CONFIG_H -DNO_KILL_INTR
		DEFS = -DUNDEF_THREADS_HACK -DHAVE_CONFIG_H -DNO_KILL_INTR '-D__RCSID(x)=' '-D__COPYRIGHT(x)=' '-D__RENAME(x)=' '-D_DIAGASSERT(x)='

		SUFFIXES = .sh

		@@ -73,13 +75,11 @@ fcns.c: ${AHDR} fcns.h makelist

		chared.o: vi.h emacs.h common.h help.h fcns.h
		el.o: vi.h emacs.h common.h help.h fcns.h
		fgetln.o: vi.h emacs.h common.h help.h fcns.h
		history.o: vi.h emacs.h common.h help.h fcns.h
		map.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
		strlcpy.o: vi.h emacs.h common.h help.h fcns.h
		tokenizer.o: vi.h emacs.h common.h help.h fcns.h
		vi.o: vi.h emacs.h common.h help.h fcns.h
		common.o: vi.h emacs.h common.h help.h fcns.h