- manual merge

sql/share/Makefile.am:
  Auto merged
tools/Makefile.am:
  Auto merged

Docs/Makefile.am

@@ -1,13 +1,18 @@
-# Normally you do not need to remake the files here. But if you want
+# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
-# 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
+# This program is free software; you can redistribute it and/or modify
-# need pdftex. We use the teTeX distribution for all of these.
+# it under the terms of the GNU General Public License as published by
-
+# the Free Software Foundation; either version 2 of the License, or
-# We avoid default automake rules because of problems with .dvi file
+# (at your option) any later version.
-# and BSD makes
+# 
-
+# This program is distributed in the hope that it will be useful,
-# If you know how to fix any of this more elegantly please mail
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# docs@mysql.com
+# 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)
 

libmysqld/examples/Makefile.am

@@ -1,3 +1,19 @@
+# Copyright (C) 2000 MySQL 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_PROGRAMS = mysql
 bin_PROGRAMS    = mysqltest_embedded mysql_client_test_embedded
 client_sources  = $(mysqltest_embedded_SOURCES) $(mysql_SOURCES)

sql/share/Makefile.am

@@ -1,3 +1,19 @@
+# Copyright (C) 2000 MySQL 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
+
 ## Process this file with automake to create Makefile.in
 
 EXTRA_DIST= errmsg.txt

support-files/mysql.spec.sh

@@ -330,6 +330,7 @@ BuildMySQL "--enable-shared \
 		--with-archive \
 		--with-csv-storage-engine \
 		--with-example-storage-engine \
+		--with-blackhole-storage-engine \
 		--with-federated-storage-engine \
 		--with-embedded-server \
 		--with-comment=\"MySQL Community Edition - Max (GPL)\" \
@@ -685,6 +686,10 @@ fi
 # itself - note that they must be ordered by date (important when
 # merging BK trees)
 %changelog 
+* Wed Apr 20 2005 Lenz Grimmer <lenz@mysql.com>
+
+- Enabled the "blackhole" storage engine for the Max RPM
+
 * Wed Apr 13 2005 Lenz Grimmer <lenz@mysql.com>
 
 - removed the MySQL manual files (html/ps/texi) - they have been removed