From c14f04957ef1799b6e0a255315f7fbca13bd6242 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 19 Apr 2005 11:15:36 +0200 Subject: [PATCH 1/4] - removed COPYING from txt_files of Docs/Makefile.am (it's already in EXTRA_DIST of the toplevel Makefile.am) Docs/Makefile.am: - removed COPYING from txt_files (it's already in EXTRA_DIST of the toplevel Makefile.am) --- Docs/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Docs/Makefile.am b/Docs/Makefile.am index 4d6aa30a30f..a0d278285b4 100644 --- a/Docs/Makefile.am +++ b/Docs/Makefile.am @@ -15,7 +15,7 @@ EXTRA_DIST = $(noinst_SCRIPTS) mysql.info INSTALL-BINARY all: txt_files -txt_files: ../INSTALL-SOURCE ../COPYING ../EXCEPTIONS-CLIENT \ +txt_files: ../INSTALL-SOURCE ../EXCEPTIONS-CLIENT \ INSTALL-BINARY ../support-files/MacOSX/ReadMe.txt CLEAN_FILES: $(txt_files) From d0b6c3646065300dd7efa980bb0d7575d6c01ed6 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 19 Apr 2005 13:33:38 +0200 Subject: [PATCH 2/4] Updated Docs/Makefile.am: - fixed copyright header and removed obsolete comments about how to build the manual using texinfo - added an "install-data-hook" to install the mysql.info info page. This seems to be the only way to install info pages, if they are not built from texinfo sources directly. Docs/Makefile.am: - fixed copyright header and removed obsolete comments about how to build the manual using texinfo - added an "install-data-hook" to install the mysql.info info page. This seems to be the only way to install info pages, if they are not built from texinfo sources directly. --- Docs/Makefile.am | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/Docs/Makefile.am b/Docs/Makefile.am index a0d278285b4..8577fee52cb 100644 --- a/Docs/Makefile.am +++ b/Docs/Makefile.am @@ -1,13 +1,18 @@ -# 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 @@ -18,6 +23,13 @@ all: txt_files txt_files: ../INSTALL-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) From 1f1a579aa929cf7f0dd0870557e7e62d9e60b2d2 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 19 Apr 2005 17:00:05 +0200 Subject: [PATCH 3/4] - added missing copyright headers to several Makefile.am's (noticed while testing changes to the mysql-copyright scripts libmysqld/examples/Makefile.am: - added a copyright header sql/share/Makefile.am: - added a copyright header tools/Makefile.am: - added a copyright header --- libmysqld/examples/Makefile.am | 16 ++++++++++++++++ sql/share/Makefile.am | 16 ++++++++++++++++ tools/Makefile.am | 16 ++++++++++++++++ 3 files changed, 48 insertions(+) diff --git a/libmysqld/examples/Makefile.am b/libmysqld/examples/Makefile.am index 61f54b88b2e..83164bc946f 100644 --- a/libmysqld/examples/Makefile.am +++ b/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 = mysqltest mysql client_sources = $(mysqltest_SOURCES) $(mysql_SOURCES) diff --git a/sql/share/Makefile.am b/sql/share/Makefile.am index c70ac9ccf57..5ca3dce4e04 100644 --- a/sql/share/Makefile.am +++ b/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 dist-hook: diff --git a/tools/Makefile.am b/tools/Makefile.am index 3c786dc9281..e182e5a87f8 100644 --- a/tools/Makefile.am +++ b/tools/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 + INCLUDES = @MT_INCLUDES@ -I$(srcdir)/../include \ $(openssl_includes) -I../include LDADD= @CLIENT_EXTRA_LDFLAGS@ ../libmysql_r/libmysqlclient_r.la @openssl_libs@ From 9b1db3efdaba71e4242d9af0053c40b29879d2ba Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 20 Apr 2005 08:39:08 +0200 Subject: [PATCH 4/4] - Enabled the "blackhole" storage engine for the Max RPM subpackage --- support-files/mysql.spec.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index df21ad63377..1de315b6458 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -331,6 +331,7 @@ BuildMySQL "--enable-shared \ --with-archive \ --with-csv-storage-engine \ --with-example-storage-engine \ + --with-blackhole-storage-engine \ --with-embedded-server \ --with-comment=\"MySQL Community Edition - Max (GPL)\" \ --with-server-suffix='-Max'" @@ -688,6 +689,10 @@ fi # itself - note that they must be ordered by date (important when # merging BK trees) %changelog +* Wed Apr 20 2005 Lenz Grimmer + +- Enabled the "blackhole" storage engine for the Max RPM + * Wed Apr 13 2005 Lenz Grimmer - removed the MySQL manual files (html/ps/texi) - they have been removed