Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0 (10cab933) · Commits · Software / OSDI20 Artifacts / mariadb

.bzrignore

+11 −10

Original line number	Diff line number	Diff line
		@@ -4,8 +4,6 @@
		*.bb
		*.bbg
		*.bin
		*.vcproj.cmake
		cmake_install.cmake
		*.cdf
		*.core
		*.d
		@@ -33,6 +31,7 @@ cmake_install.cmake
		*.spec
		*.user
		*.vcproj
		*.vcproj.cmake
		/.dir/*
		/_pure_*warnings
		*/.deps
		@@ -347,6 +346,7 @@ client/tmp.diff
		client_debug/*
		client_release/*
		client_test
		cmake_install.cmake
		cmd-line-utils/libedit/common.h
		cmd-line-utils/libedit/makelist
		comon.h
		@@ -366,6 +366,9 @@ contrib/*.vcproj
		core
		core.*
		core.2430
		cscope.in.out
		cscope.out
		cscope.po.out
		db-..*
		dbug/*.ds?
		dbug/*.vcproj
		@@ -377,6 +380,8 @@ dbug/main.r
		dbug/output*.r
		dbug/user.ps
		dbug/user.t
		debian/control
		debian/defs.mk
		depcomp
		emacs.h
		examples/*.ds?
		@@ -413,6 +418,7 @@ heap/hp_test2
		help
		help.c
		help.h
		include/abi_check
		include/check_abi
		include/my_config.h
		include/my_global.h
		@@ -472,6 +478,7 @@ libmysql/release/libmysql.exp
		libmysql/vio_priv.h
		libmysql_r/*.c
		libmysql_r/acconfig.h
		libmysql_r/client_settings.h
		libmysql_r/conf_to_src
		libmysql_r/my_static.h
		libmysql_r/mysys_priv.h
		@@ -1257,6 +1264,7 @@ support-files/mysql-3.23.29-gamma.spec
		support-files/mysql-log-rotate
		support-files/mysql.server
		support-files/mysql.spec
		support-files/mysqld_multi.server
		support-files/ndb-config-2-node.ini
		tags
		test/ndbapi/bank/bankCreator
		@@ -1315,6 +1323,7 @@ test_xml
		tests/*.ds?
		tests/*.vcproj
		tests/.libs -prune
		tests/bug25714
		tests/client_test
		tests/connect_test
		tests/mysql_client_test
		@@ -1342,11 +1351,3 @@ win/vs71cache.txt
		win/vs8cache.txt
		zlib/*.ds?
		zlib/*.vcproj
		debian/control
		debian/defs.mk
		include/abi_check
		support-files/mysqld_multi.server
		tests/bug25714
		cscope.in.out
		cscope.out
		cscope.po.out

BUILD/compile-solaris-amd64

0 → 100755

+55 −0

Original line number	Diff line number	Diff line
		#!/usr/bin/bash

		function _find_mysql_root () (
		while [ "x$PWD" != "x/" ]; do
		# Check if some directories are present
		if [ -d BUILD -a -d sql -a -d mysys ]; then
		echo "$PWD"
		return 0
		fi
		cd ..
		done
		return 1
		)

		make -k clean \|\| true
		/bin/rm -f /.deps/.P config.cache

		path=`dirname $0`
		. "$path/autorun.sh"

		warning_flags="-Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings -Wunused"
		compiler_flags="-g -O3 -fno-omit-frame-pointer"

		export CC CXX CFLAGS CXXFLAGS LDFLAGS LIBS
		CC="gcc"
		CXX="gcc"
		CFLAGS="$warning_flags $compiler_flags"
		CXXFLAGS=""
		LDFLAGS="-O3 -g -static-libgcc"
		LIBS=-lmtmalloc
		root=$(_find_mysql_root)

		$root/configure \
		--prefix=/usr/local/mysql \
		--localstatedir=/usr/local/mysql/data \
		--libexecdir=/usr/local/mysql/bin \
		--with-extra-charsets=complex \
		--enable-thread-safe-client \
		--enable-local-infile \
		--with-zlib-dir=bundled \
		--with-big-tables \
		--with-readline \
		--with-archive-storage-engine \
		--with-named-curses=-lcurses \
		--with-big-tables \
		--with-innodb \
		--with-berkeley-db \
		--with-example-storage-engine \
		--with-blackhole-storage-engine \
		--with-ndbcluster \
		--with-federated-storage-engine \
		--with-csv-storage-engine \
		--with-ssl \
		--with-embedded-server \
		--disable-shared

BitKeeper/triggers/pre-commit.check-case.pl

0 → 100755

+26 −0

Original line number	Diff line number	Diff line
		#!/usr/bin/perl
		my $status = 0;

		my $pending = $ENV{'BK_PENDING'};
		exit 0 unless -f $pending;

		open FI, "<", $pending \|\| exit 0;
		while(<FI>) {
		my ($file, $stuff) = split /\\|/, $_, 2;
		next unless -f $file;
		$file =~ s/^(.)\/([^\/])$/$2/;
		my $path = $1;
		opendir DIR, $path;
		my @files = sort map { lc } readdir DIR;
		closedir DIR;
		my %count = ();
		$count{$_}++ for @files;
		@files = grep { $count{$_} > 1 } keys %count;
		if(@files > 0) {
		print "$path/$file: duplicate file names: " . (join " ", @files) . "\n";
		$status = 1;
		}
		}
		close FI;

		exit $status;

CMakeLists.txt

+11 −8

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.
		@@ -109,6 +111,15 @@ IF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR
		STRING(REPLACE "/EHsc" "" CMAKE_CXX_FLAGS_INIT ${CMAKE_CXX_FLAGS_INIT})
		STRING(REPLACE "/EHsc" "" CMAKE_CXX_FLAGS_DEBUG_INIT ${CMAKE_CXX_FLAGS_DEBUG_INIT})

		# Disable automatic manifest generation.
		STRING(REPLACE "/MANIFEST" "/MANIFEST:NO" CMAKE_EXE_LINKER_FLAGS
		${CMAKE_EXE_LINKER_FLAGS})
		# Explicitly disable it since it is the default for newer versions of VS
		STRING(REGEX MATCH "MANIFEST:NO" tmp_manifest ${CMAKE_EXE_LINKER_FLAGS})
		IF(NOT tmp_manifest)
		SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MANIFEST:NO")
		ENDIF(NOT tmp_manifest)

		ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR
		CMAKE_GENERATOR MATCHES "Visual Studio 8")

		@@ -156,14 +167,6 @@ IF(EMBED_MANIFESTS)
		MESSAGE(FATAL_ERROR "Sign tool, signtool.exe, can't be found.")
		ENDIF(HAVE_SIGN_TOOL)

		# Disable automatic manifest generation.
		STRING(REPLACE "/MANIFEST" "/MANIFEST:NO" CMAKE_EXE_LINKER_FLAGS
		${CMAKE_EXE_LINKER_FLAGS})
		# Explicitly disable it since it is the default for newer versions of VS
		STRING(REGEX MATCH "MANIFEST:NO" tmp_manifest ${CMAKE_EXE_LINKER_FLAGS})
		IF(NOT tmp_manifest)
		SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MANIFEST:NO")
		ENDIF(NOT tmp_manifest)
		# Set the processor architecture.
		IF(CMAKE_GENERATOR MATCHES "Visual Studio 8 2005 Win64")
		SET(PROCESSOR_ARCH "amd64")

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.