bk commit into 5.0 tree (lenz:1.1863)

[lenz]

Below is the list of changes that have just been committed into a local
5.0 repository of lenz. When lenz does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1863 05/04/21 08:30:59 lenz@stripped +4 -0
  - manual merge

  support-files/mysql.spec.sh
    1.99 05/04/21 08:30:55 lenz@stripped +1 -1
    - manual merge

  libmysqld/examples/Makefile.am
    1.29 05/04/21 08:30:55 lenz@stripped +0 -0
    - manual merge

  tools/Makefile.am
    1.19 05/04/20 23:18:58 lenz@stripped +0 -0
    Auto merged

  sql/share/Makefile.am
    1.29 05/04/20 23:18:58 lenz@stripped +0 -0
    Auto merged

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	lenz
# Host:	metis.lenznet
# Root:	/space/my/mysql-5.0-build/RESYNC

--- 1.28/sql/share/Makefile.am	2005-04-11 17:44:20 +02:00
+++ 1.29/sql/share/Makefile.am	2005-04-20 23:18:58 +02:00
@@ -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

--- 1.98/support-files/mysql.spec.sh	2005-04-13 19:56:36 +02:00
+++ 1.99/support-files/mysql.spec.sh	2005-04-21 08:30:55 +02:00
@@ -330,6 +330,7 @@
 		--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 @@
 # itself - note that they must be ordered by date (important when
 # merging BK trees)
 %changelog 
+* Wed Apr 20 2005 Lenz Grimmer <lenz@stripped>
+
+- Enabled the "blackhole" storage engine for the Max RPM
+
 * Wed Apr 13 2005 Lenz Grimmer <lenz@stripped>
 
 - removed the MySQL manual files (html/ps/texi) - they have been removed

--- 1.28/libmysqld/examples/Makefile.am	2005-03-17 23:49:35 +01:00
+++ 1.29/libmysqld/examples/Makefile.am	2005-04-21 08:30:55 +02:00
@@ -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)