Commit f239b78c authored by unknown's avatar unknown
Browse files

Merge 


scripts/mysql_fix_privilege_tables.sql:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
configure.in:
  merge
parents 5f305269 26d95ae4

BUILD/SETUP.sh

+5 −5
Original line number Diff line number Diff line
@@ -48,13 +48,13 @@ global_warnings="-Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wch 
c_warnings="$global_warnings -Wunused"

cxx_warnings="$global_warnings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor"



base_max_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-raid --with-openssl --with-raid"

max_leave_isam_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-federated-storage-engine --with-raid --with-openssl --with-raid --with-embedded-server"

base_max_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-raid --with-openssl --with-raid --with-big-tables"

max_leave_isam_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-federated-storage-engine --with-raid --with-openssl --with-raid --with-embedded-server --with-big-tables"

max_no_es_configs="$max_leave_isam_configs --without-isam"

max_configs="$max_no_es_configs --with-embedded-server"



alpha_cflags="-mcpu=ev6 -Wa,-mev6"	# Not used yet

amd64_cflags="-DBIG_TABLES"

amd64_cflags=""				# If dropping '--with-big-tables', add here  "-DBIG_TABLES"

pentium_cflags="-mcpu=pentiumpro"

pentium64_cflags="-mcpu=nocona -m64"

ppc_cflags="-mpowerpc -mcpu=powerpc"
@@ -70,9 +70,9 @@ debug_cflags="-DUNIV_MUST_NOT_INLINE -DEXTRA_DEBUG -DFORCE_INIT_OF_VARS -DSAFEMA 
debug_extra_cflags="-O1 -Wuninitialized"



base_cxxflags="-felide-constructors -fno-exceptions -fno-rtti"

amd64_cxxflags="-DBIG_TABLES"

amd64_cxxflags=""				# If dropping '--with-big-tables', add here  "-DBIG_TABLES"



base_configs="$prefix_configs --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client --with-readline"

base_configs="$prefix_configs --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client --with-readline --with-big-tables"

static_link="--with-mysqld-ldflags=-all-static --with-client-ldflags=-all-static"

amd64_configs=""

alpha_configs=""	# Not used yet

Docs/Makefile.am

+23 −11
Original line number Diff line number Diff line 
# Normally you do not need to remake the files here. But if you want

# to you will need the GNU TeX-info utilities. To make a Postscript

# files you also need TeX and dvips. To make the PDF file you will

# need pdftex. We use the teTeX distribution for all of these.



# We avoid default automake rules because of problems with .dvi file

# and BSD makes



# If you know how to fix any of this more elegantly please mail

# docs@mysql.com

# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB

# 

# This program is free software; you can redistribute it and/or modify

# it under the terms of the GNU General Public License as published by

# the Free Software Foundation; either version 2 of the License, or

# (at your option) any later version.

# 

# This program 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 General Public License for more details.

# 

# You should have received a copy of the GNU General Public License

# along with this program; if not, write to the Free Software

# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA



noinst_SCRIPTS =	Support/generate-text-files.pl
@@ -15,9 +20,16 @@ EXTRA_DIST = $(noinst_SCRIPTS) mysql.info INSTALL-BINARY 


all:			txt_files



txt_files:		../INSTALL-SOURCE ../COPYING ../INSTALL-WIN-SOURCE ../EXCEPTIONS-CLIENT \

txt_files:		../INSTALL-SOURCE ../INSTALL-WIN-SOURCE ../EXCEPTIONS-CLIENT \

			INSTALL-BINARY ../support-files/MacOSX/ReadMe.txt



# make sure that "make install" installs the info page, too

# automake only seems to take care of this automatically,

# if we're building the info page from texi directly.

install-data-hook:	mysql.info

	$(mkinstalldirs) $(DESTDIR)$(infodir)

	$(INSTALL_DATA) $(srcdir)/mysql.info $(DESTDIR)$(infodir)



CLEAN_FILES:		$(txt_files)

	touch $(txt_files)

cmd-line-utils/readline/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ pkginclude_HEADERS = readline.h chardefs.h keymaps.h \ 
			history.h tilde.h rlmbutil.h rltypedefs.h rlprivate.h \

			rlshell.h xmalloc.h



noinst_HEADERS =	rldefs.h histlib.h rlwinsize.h \

noinst_HEADERS =	config_readline.h rldefs.h histlib.h rlwinsize.h \

			posixstat.h posixdir.h posixjmp.h \

			tilde.h rlconf.h rltty.h ansi_stdlib.h \

			tcap.h rlstdc.h

cmd-line-utils/readline/bind.c

+1 −3
Original line number Diff line number Diff line
@@ -21,9 +21,7 @@ 
   59 Temple Place, Suite 330, Boston, MA 02111 USA. */

#define READLINE_LIBRARY



#if defined (HAVE_CONFIG_H)

#  include <config.h>

#endif

#include "config_readline.h"



#include <stdio.h>

#include <sys/types.h>

cmd-line-utils/readline/callback.c

+1 −3
Original line number Diff line number Diff line
@@ -21,9 +21,7 @@ 
   59 Temple Place, Suite 330, Boston, MA 02111 USA. */

#define READLINE_LIBRARY



#if defined (HAVE_CONFIG_H)

#  include <config.h>

#endif

#include "config_readline.h"



#include "rlconf.h"