Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-forcollapseandmerge (edbacd3a) · Commits · Software / OSDI20 Artifacts / mariadb

.bzrignore

+1 −1

Original line number	Diff line number	Diff line
		@@ -900,6 +900,7 @@ libmysql_r/.libs/libmysqlclient_r.lai
		libmysql_r/.libs/libmysqlclient_r.so.15
		libmysql_r/.libs/libmysqlclient_r.so.15.0.0
		libmysql_r/acconfig.h
		libmysql_r/client_settings.h
		libmysql_r/conf_to_src
		libmysql_r/my_static.h
		libmysql_r/mysys_priv.h
		@@ -3004,4 +3005,3 @@ win/vs71cache.txt
		win/vs8cache.txt
		zlib/*.ds?
		zlib/*.vcproj
		libmysql_r/client_settings.h

CMakeLists.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -13,6 +13,8 @@
		# along with this program; if not, write to the Free Software
		# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA

		CMAKE_MINIMUM_REQUIRED(VERSION 2.4.7 FATAL_ERROR)

		PROJECT(MySql)

		# This reads user configuration, generated by configure.js.

Docs/INSTALL-BINARY

0 → 100644

+8 −0

Original line number	Diff line number	Diff line

		You can find information about how to install binary distributions at

		http://dev.mysql.com/doc/refman/5.0/en/quick-standard-installation.html

		The MySQL Reference Manual is also available in various formats on
		http://dev.mysql.com/doc; if you're interested in the DocBook XML
		sources go to http://svn.mysql.com.

Docs/Makefile.am

+1 −41

Original line number	Diff line number	Diff line
		@@ -13,14 +13,7 @@
		# 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 = generate-text-files.pl

		EXTRA_DIST = $(noinst_SCRIPTS) manual.chm mysql.info INSTALL-BINARY

		TXT_FILES= ../INSTALL-SOURCE ../INSTALL-WIN-SOURCE \
		INSTALL-BINARY ../support-files/MacOSX/ReadMe.txt

		all-local: $(TXT_FILES)
		EXTRA_DIST = mysql.info INSTALL-BINARY

		# make sure that "make install" installs the info page, too
		# automake only seems to take care of this automatically,
		@@ -32,38 +25,5 @@ install-data-hook: $(srcdir)/mysql.info
		uninstall-local:
		@RM@ -f $(DESTDIR)$(infodir)/mysql.info

		# Problems with "make distclean", works differently for make files
		# generated by different versions of the automake. Some require the
		# generated files explicitly in DISTCLEANFILES.
		DISTCLEANFILES = $(TXT_FILES)

		# This target is not used in builds, just for convinience
		CLEAN_FILES: $(TXT_FILES)
		touch $(TXT_FILES)

		GT = $(srcdir)/generate-text-files.pl

		../INSTALL-SOURCE: $(srcdir)/mysql.info $(GT)
		perl -w $(GT) $(srcdir)/mysql.info "installing-source" "windows-source-build" > $@

		../INSTALL-WIN-SOURCE: $(srcdir)/mysql.info $(GT)
		perl -w $(GT) $(srcdir)/mysql.info "windows-source-build" "post-installation" > $@

		# We put the description for the binary installation here so that
		# people who download source wont have to see it. It is moved up to
		# the toplevel by the script that makes the binary tar files.
		INSTALL-BINARY: $(srcdir)/mysql.info $(GT)
		perl -w $(GT) $(srcdir)/mysql.info "installing-binary" "installing-source" > $@

		../support-files/MacOSX/ReadMe.txt: $(srcdir)/mysql.info $(GT)
		perl -w $(GT) $(srcdir)/mysql.info "mac-os-x-installation" "netware-installation" > $@

		# Include the Windows manual.chm in source .tar.gz only if available.
		# It is not in BitKeeper, but is downloaded from intranet by Bootstrap.
		dist-hook:
		if [ -e $(srcdir)/manual.chm ] ; then \
		cp -f $(srcdir)/manual.chm $(distdir); \
		fi

		# Don't update the files from bitkeeper
		%::SCCS/s.%

Docs/generate-text-files.pl

deleted100755 → 0

+0 −58

Original line number	Diff line number	Diff line
		#!/usr/bin/perl -w -- perl --
		# Copyright (C) 2000, 2003, 2005 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; version 2 of the License.
		#
		# 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA

		# Generate text files from top directory from the manual.

		$from = shift(@ARGV);
		$fnode = shift(@ARGV);
		$tnode = shift(@ARGV);

		open(IN, "$from") \|\| die "Cannot open $from: $!";

		$in = 0;

		while (<IN>)
		{
		if ($in)
		{
		if (/Node: $tnode,/ \|\| /\[index/)
		{
		$in = 0;
		}
		elsif (/^File: mysql.info/ \|\| (/^/))
		{
		# Just Skip node beginnings
		}
		else
		{
		print;
		}
		}
		else
		{
		if (/Node: $fnode,/)
		{
		$in = 1;
		# Skip first empty line
		<IN>;
		}
		}
		}

		close(IN);

		die "Could not find node \"$tnode\"" if ($in == 1);
		exit 0;