merging (f9dd79c7) · Commits · Software / OSDI20 Artifacts / mariadb

.bzrignore

+144 −13

Original line number	Diff line number	Diff line
		@@ -45,6 +45,19 @@ COPYING
		COPYING.LIB
		Docs/#manual.texi#
		Docs/INSTALL-BINARY
		Docs/Images/myaccess-odbc.txt
		Docs/Images/myaccess.txt
		Docs/Images/myarchitecture.txt
		Docs/Images/mydll-properties.txt
		Docs/Images/mydsn-example.txt
		Docs/Images/mydsn-icon.txt
		Docs/Images/mydsn-options.txt
		Docs/Images/mydsn-setup.txt
		Docs/Images/mydsn-test-fail.txt
		Docs/Images/mydsn-test-success.txt
		Docs/Images/mydsn-trace.txt
		Docs/Images/mydsn.txt
		Docs/Images/myflowchart.txt
		Docs/include.texi
		Docs/internals.html
		Docs/internals.info
		@@ -88,7 +101,9 @@ Makefile.in
		Makefile.in'
		PENDING/*
		TAGS
		ac_available_languages_fragment
		aclocal.m4
		analyse.test
		autom4te-2.53.cache/output.0
		autom4te-2.53.cache/requests
		autom4te-2.53.cache/traces.0
		@@ -241,6 +256,7 @@ client/mf_iocache.c
		client/mf_iocache.cc
		client/mysql
		client/mysqladmin
		client/mysqladmin.c
		client/mysqlbinlog
		client/mysqlcheck
		client/mysqldump
		@@ -287,6 +303,7 @@ gmon.out
		hardcopy.0
		heap/hp_test1
		heap/hp_test2
		help
		help.c
		help.h
		include/my_config.h
		@@ -355,7 +372,9 @@ libmysqld/field_conv.cc
		libmysqld/filesort.cc
		libmysqld/get_password.c
		libmysqld/gstream.cc
		libmysqld/ha_archive.cc
		libmysqld/ha_berkeley.cc
		libmysqld/ha_example.cc
		libmysqld/ha_heap.cc
		libmysqld/ha_innobase.cc
		libmysqld/ha_innodb.cc
		@@ -363,6 +382,7 @@ libmysqld/ha_isam.cc
		libmysqld/ha_isammrg.cc
		libmysqld/ha_myisam.cc
		libmysqld/ha_myisammrg.cc
		libmysqld/ha_tina.cc
		libmysqld/handler.cc
		libmysqld/hash_filo.cc
		libmysqld/hostname.cc
		@@ -492,15 +512,71 @@ myisam/test2.MYD
		myisam/test2.MYI
		mysql-4.0.2-alpha-pc-linux-gnu-i686.tar.gz
		mysql-4.0.2-alpha.tar.gz
		mysql-4.1.8-win-src.zip
		mysql-max-4.0.2-alpha-pc-linux-gnu-i686.tar.gz
		mysql-test/gmon.out
		mysql-test/install_test_db
		mysql-test/mysql-test-run
		mysql-test/mysql-test-run.log
		mysql-test/mysql_test_run_new
		mysql-test/ndb/ndbcluster
		mysql-test/r/*.reject
		mysql-test/r/alter_table.err
		mysql-test/r/archive.err
		mysql-test/r/bdb-alter-table-1.err
		mysql-test/r/bdb-alter-table-2.err
		mysql-test/r/bdb-crash.err
		mysql-test/r/bdb-deadlock.err
		mysql-test/r/bdb.err
		mysql-test/r/bdb_cache.err
		mysql-test/r/client_test.err
		mysql-test/r/csv.err
		mysql-test/r/ctype_ucs.err
		mysql-test/r/derived.err
		mysql-test/r/exampledb.err
		mysql-test/r/func_encrypt.err
		mysql-test/r/isam.err
		mysql-test/r/lowercase_table2.err
		mysql-test/r/multi_update.err
		mysql-test/r/mysql_protocols.err
		mysql-test/r/mysqlbinlog.err
		mysql-test/r/mysqlbinlog2.err
		mysql-test/r/mysqldump.err
		mysql-test/r/mysqltest.err
		mysql-test/r/ndb_alter_table.err
		mysql-test/r/ndb_autodiscover.err
		mysql-test/r/ndb_autodiscover2.err
		mysql-test/r/ndb_basic.err
		mysql-test/r/ndb_blob.err
		mysql-test/r/ndb_cache.err
		mysql-test/r/ndb_charset.err
		mysql-test/r/ndb_index.err
		mysql-test/r/ndb_index_ordered.err
		mysql-test/r/ndb_index_unique.err
		mysql-test/r/ndb_insert.err
		mysql-test/r/ndb_limit.err
		mysql-test/r/ndb_lock.err
		mysql-test/r/ndb_minmax.err
		mysql-test/r/ndb_replace.err
		mysql-test/r/ndb_subquery.err
		mysql-test/r/ndb_transaction.err
		mysql-test/r/ndb_truncate.err
		mysql-test/r/ndb_types.err
		mysql-test/r/ndb_update.err
		mysql-test/r/openssl_1.err
		mysql-test/r/ps_1general.err
		mysql-test/r/ps_6bdb.err
		mysql-test/r/ps_7ndb.err
		mysql-test/r/query_cache.err
		mysql-test/r/query_cache_merge.err
		mysql-test/r/raid.err
		mysql-test/r/repair.err
		mysql-test/r/replace.err
		mysql-test/r/rpl000001.err
		mysql-test/r/rpl000001.eval
		mysql-test/r/rpl000002.eval
		mysql-test/r/rpl000014.eval
		mysql-test/r/rpl000015.err
		mysql-test/r/rpl000015.eval
		mysql-test/r/rpl000016.eval
		mysql-test/r/rpl_log.eval
		@@ -641,6 +717,8 @@ ndb/examples/ndbapi_example2/ndbapi_example2
		ndb/examples/ndbapi_example3/ndbapi_example3
		ndb/examples/ndbapi_example5/ndbapi_example5
		ndb/examples/select_all/select_all
		ndb/include/ndb_global.h
		ndb/include/ndb_version.h
		ndb/lib/libMGM_API.so
		ndb/lib/libNDB_API.so
		ndb/lib/libNDB_ODBC.so
		@@ -711,10 +789,25 @@ ndb/tools/ndb_delete_all
		ndb/tools/ndb_desc
		ndb/tools/ndb_drop_index
		ndb/tools/ndb_drop_table
		ndb/tools/ndb_restore
		ndb/tools/ndb_select_all
		ndb/tools/ndb_select_count
		ndb/tools/ndb_show_tables
		ndb/tools/ndb_test_platform
		ndb/tools/ndb_waiter
		ndbcluster-1186
		ndbcluster-1186/SCCS
		ndbcluster-1186/config.ini
		ndbcluster-1186/ndb_1.pid
		ndbcluster-1186/ndb_1_out.log
		ndbcluster-1186/ndb_1_signal.log
		ndbcluster-1186/ndb_2.pid
		ndbcluster-1186/ndb_2_out.log
		ndbcluster-1186/ndb_2_signal.log
		ndbcluster-1186/ndb_3.pid
		ndbcluster-1186/ndb_3_cluster.log
		ndbcluster-1186/ndb_3_out.log
		ndbcluster-1186/ndbcluster.pid
		pull.log
		regex/re
		repl-tests/test-repl-ts/repl-timestamp.master.reject
		@@ -909,16 +1002,54 @@ vio/test-ssl
		vio/test-sslclient
		vio/test-sslserver
		vio/viotest-ssl
		Docs/Images/myaccess-odbc.txt
		Docs/Images/myaccess.txt
		Docs/Images/myarchitecture.txt
		Docs/Images/mydll-properties.txt
		Docs/Images/mydsn-example.txt
		Docs/Images/mydsn-icon.txt
		Docs/Images/mydsn-options.txt
		Docs/Images/mydsn-setup.txt
		Docs/Images/mydsn-test-fail.txt
		Docs/Images/mydsn-test-success.txt
		Docs/Images/mydsn-trace.txt
		Docs/Images/mydsn.txt
		Docs/Images/myflowchart.txt
		tests/mysql_client_test
		tests/mysql_client_test
		libmysqld/examples/mysql_client_test.c
		libmysqld/examples/mysql_client_test_embedded
		libmysqld/examples/mysqltest_embedded
		ndb/src/common/debugger/signaldata/libsignaldataprint.dsp
		ndb/src/common/debugger/libtrace.dsp
		ndb/src/common/logger/liblogger.dsp
		ndb/src/common/mgmcommon/libmgmsrvcommon.dsp
		ndb/src/common/portlib/libportlib.dsp
		ndb/src/common/transporter/libtransporter.dsp
		ndb/src/common/util/libgeneral.dsp
		ndb/src/kernel/blocks/backup/libbackup.dsp
		ndb/src/kernel/blocks/cmvmi/libcmvmi.dsp
		ndb/src/kernel/blocks/dbacc/libdbacc.dsp
		ndb/src/kernel/blocks/dbdict/libdbdict.dsp
		ndb/src/kernel/blocks/dbdih/libdbdih.dsp
		ndb/src/kernel/blocks/dblqh/libdblqh.dsp
		ndb/src/kernel/blocks/dbtc/libdbtc.dsp
		ndb/src/kernel/blocks/dbtup/libdbtup.dsp
		ndb/src/kernel/blocks/dbtux/libdbtux.dsp
		ndb/src/kernel/blocks/dbutil/libdbutil.dsp
		ndb/src/kernel/blocks/grep/libgrep.dsp
		ndb/src/kernel/blocks/ndbcntr/libndbcntr.dsp
		ndb/src/kernel/blocks/ndbfs/libndbfs.dsp
		ndb/src/kernel/blocks/qmgr/libqmgr.dsp
		ndb/src/kernel/blocks/suma/libsuma.dsp
		ndb/src/kernel/blocks/trix/libtrix.dsp
		ndb/src/kernel/error/liberror.dsp
		ndb/src/kernel/vm/libkernel.dsp
		ndb/src/kernel/ndbd.dsp
		ndb/src/mgmapi/libmgmapi.dsp
		ndb/src/mgmclient/ndb_mgm.dsp
		ndb/src/mgmclient/libndbmgmclient.dsp
		ndb/src/mgmsrv/ndb_mgmd.dsp
		ndb/src/ndbapi/libndbapi.dsp
		ndb/src/libndbclient.dsp
		ndb/test/ndbapi/flexBench.dsp
		ndb/test/ndbapi/testBasic.dsp
		ndb/test/ndbapi/testBlobs.dsp
		ndb/test/ndbapi/testScan.dsp
		ndb/test/src/libNDBT.dsp
		ndb/tools/ndb_waiter.dsp
		ndb/tools/ndb_drop_table.dsp
		ndb/tools/ndb_delete_all.dsp
		ndb/tools/ndb_desc.dsp
		ndb/tools/ndb_drop_index.dsp
		ndb/tools/ndb_show_tables.dsp
		ndb/tools/ndb_select_all.dsp
		ndb/tools/ndb_select_count.dsp
		support-files/ndb-config-2-node.ini

BUILD/SETUP.sh

100644 → 100755

+24 −6

Original line number	Diff line number	Diff line
		#!/bin/sh

		if ! test -f sql/mysqld.cc
		then
		echo "You must run this script from the MySQL top-level directory"
		exit 1
		fi

		prefix_configs="--prefix=/usr/local/mysql"
		just_print=
		just_configure=
		full_debug=
		while test $# -gt 0
		do
		case "$1" in
		--prefix=* ) prefix_configs="$1"; shift ;;
		--with-debug=full ) full_debug="=full"; shift ;;
		-c \| --just-configure ) just_configure=1; shift ;;
		-n \| --just-print \| --print ) just_print=1; shift ;;
		-h \| --help ) cat <<EOF; exit 0 ;;
		@@ -17,13 +22,15 @@ Usage: $0 [-h\|-n] [configure-options]
		-h, --help Show this help message.
		-n, --just-print Don't actually run any commands; just print them.
		-c, --just-configure Stop after running configure.

		Any other options will be passed directly to configure.
		--with-debug=full Build with full debug.
		--prefix=path Build with prefix 'path'.

		Note: this script is intended for internal use by MySQL developers.
		EOF
		--with-debug=full ) full_debug="=full"; shift ;;
		* ) break ;;
		* )
		echo "Unknown option '$1'"
		exit 1
		break ;;
		esac
		done

		@@ -41,8 +48,16 @@ global_warnings="-Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wch
		c_warnings="$global_warnings -Wunused"
		cxx_warnings="$global_warnings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor"

		base_max_configs="--with-innodb --with-bdb --with-ndbcluster --with-archive-storage-engine --with-raid --with-openssl --with-raid --with-vio"
		max_leave_isam_configs="--with-innodb --with-bdb --with-ndbcluster --with-archive-storage-engine --with-raid --with-openssl --with-raid --with-vio --with-embedded-server"
		max_no_es_configs="$max_leave_isam_configs --without-isam"
		max_configs="$max_no_es_configs --with-embedded-server"

		alpha_cflags="-mcpu=ev6 -Wa,-mev6" # Not used yet
		amd64_cflags="-DBIG_TABLES"
		pentium_cflags="-mcpu=pentiumpro"
		pentium64_cflags="-mcpu=nocona -m64"
		ppc_cflags="-mpowerpc -mcpu=powerpc"
		sparc_cflags=""

		# be as fast as we can be without losing our ability to backtrace
		@@ -52,11 +67,14 @@ fast_cflags="-O3 -fno-omit-frame-pointer"
		reckless_cflags="-O3 -fomit-frame-pointer "

		debug_cflags="-DUNIV_MUST_NOT_INLINE -DEXTRA_DEBUG -DFORCE_INIT_OF_VARS -DSAFEMALLOC -DPEDANTIC_SAFEMALLOC -DSAFE_MUTEX"
		debug_extra_cflags="-O1 -Wuninitialized"

		base_cxxflags="-felide-constructors -fno-exceptions -fno-rtti"
		amd64_cxxflags="-DBIG_TABLES"

		base_configs="--prefix=/usr/local/mysql --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client --with-readline"
		base_configs="$prefix_configs --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client --with-readline"
		static_link="--with-mysqld-ldflags=-all-static --with-client-ldflags=-all-static"
		amd64_configs=""
		alpha_configs="" # Not used yet
		pentium_configs=""
		sparc_configs=""
		@@ -68,7 +86,7 @@ local_infile_configs="--enable-local-infile"
		debug_configs="--with-debug$full_debug"
		if [ -z "$full_debug" ]
		then
		debug_cflags="$debug_cflags -O1 -Wuninitialized"
		debug_cflags="$debug_cflags $debug_extra_cflags"
		fi

		if gmake --version > /dev/null 2>&1

BUILD/compile-amd64-debug-max

0 → 100755

+9 −0

Original line number	Diff line number	Diff line
		#! /bin/sh
		path=`dirname $0`
		. "$path/SETUP.sh"
		extra_flags="$amd64_cflags $debug_cflags $max_cflags"
		c_warnings="$c_warnings $debug_extra_warnings"
		cxx_warnings="$cxx_warnings $debug_extra_warnings"
		extra_configs="$amd64_configs $debug_configs $max_configs"

		. "$path/FINISH.sh"

BUILD/compile-amd64-max

0 → 100755

+8 −0

Original line number	Diff line number	Diff line
		#! /bin/sh

		path=`dirname $0`
		. "$path/SETUP.sh"
		extra_flags="$amd64_cflags $fast_cflags $max_cflags -g"
		extra_configs="$amd64_configs $max_configs"

		. "$path/FINISH.sh"

BUILD/compile-dist

0 → 100755

+48 −0

Original line number	Diff line number	Diff line
		#!/bin/sh
		#
		# This script's purpose is to update the automake/autoconf helper scripts and
		# to run a plain "configure" without any special compile flags. Only features
		# that affect the content of the source distribution are enabled. The resulting
		# tree can then be picked up by "make dist" to create the "pristine source
		# package" that is used as the basis for all other binary builds.
		#
		make distclean
		aclocal
		autoheader
		libtoolize --automake --force --copy
		automake --force --add-missing --copy
		autoconf
		(cd bdb/dist && sh s_all)
		(cd innobase && aclocal && autoheader && aclocal && automake && autoconf)

		# Default to gcc for CC and CXX
		if test -z "$CXX" ; then
		export CXX=gcc
		fi

		if test -z "$CC" ; then
		export CC=gcc
		fi

		# Use ccache, if available
		if ccache -V > /dev/null 2>&1
		then
		if ! (echo "$CC" \| grep "ccache" > /dev/null)
		then
		export CC="ccache $CC"
		fi
		if ! (echo "$CXX" \| grep "ccache" > /dev/null)
		then
		export CXX="ccache $CXX"
		fi
		fi

		# Make sure to enable all features that affect "make dist"
		./configure \
		--with-embedded-server \
		--with-berkeley-db \
		--with-innodb \
		--enable-thread-safe-client \
		--with-extra-charsets=complex \
		--with-ndbcluster
		make