Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb (4fde2c20) · Commits · Software / OSDI20 Artifacts / mariadb

.bzrignore

+3 −1

Original line number	Diff line number	Diff line
		@@ -708,7 +708,6 @@ mysql-test/r/*.err
		mysql-test/r/*.log
		mysql-test/r/*.out
		mysql-test/r/*.reject
		mysql-test/r/*.warnings
		mysql-test/r/alter_table.err
		mysql-test/r/archive.err
		mysql-test/r/bdb-alter-table-1.err
		@@ -1342,3 +1341,6 @@ win/vs71cache.txt
		win/vs8cache.txt
		zlib/*.ds?
		zlib/*.vcproj
		debian/control
		debian/defs.mk
		include/abi_check

BUILD/check-cpu

+6 −0

Original line number	Diff line number	Diff line
		@@ -104,6 +104,12 @@ check_cpu () {
		Athlon64*)
		cpu_arg="athlon64";
		;;
		Turion)
		cpu_arg="athlon64";
		;;
		Opteron)
		cpu_arg="athlon64";
		;;
		Athlon)
		cpu_arg="athlon";
		;;

BUILD/compile-pentium-gcov

+3 −2

Original line number	Diff line number	Diff line
		@@ -13,8 +13,9 @@ export LDFLAGS="-fprofile-arcs -ftest-coverage"

		# The -fprofile-arcs and -ftest-coverage options cause GCC to instrument the
		# code with profiling information used by gcov.
		# the -DDISABLE_TAO_ASM is needed to avoid build failures in Yassl.
		extra_flags="$pentium_cflags -fprofile-arcs -ftest-coverage -DDISABLE_TAO_ASM $debug_cflags $max_cflags -DMYSQL_SERVER_SUFFIX=-gcov"
		# The -DDISABLE_TAO_ASM is needed to avoid build failures in Yassl.
		# The -DHAVE_gcov enables code to write out coverage info even when crashing.
		extra_flags="$pentium_cflags -fprofile-arcs -ftest-coverage -DDISABLE_TAO_ASM $debug_cflags $max_cflags -DMYSQL_SERVER_SUFFIX=-gcov -DHAVE_gcov"
		c_warnings="$c_warnings $debug_extra_warnings"
		cxx_warnings="$cxx_warnings $debug_extra_warnings"
		extra_configs="$pentium_configs $debug_configs --disable-shared $static_link"

BitKeeper/triggers/post-commit

+22 −24

Original line number	Diff line number	Diff line
		@@ -33,6 +33,13 @@ then
		exit
		fi

		IS_MERGE=`bk changes -r+ -k -m`
		if [ "$IS_MERGE" = "" ]
		then
		echo Merge changeset, not sending mails
		exit
		fi

		CHANGESET=`bk -R prs -r+ -h -d':P:::I:' ChangeSet`
		CSETKEY=`bk -R prs -r+ -h -d':KEY:' ChangeSet`
		#
		@@ -48,44 +55,35 @@ WL=`bk -R prs -r+ -h -d':C:' ChangeSet \| \
		s/.$WL#[0-9][0-9]$/ \1/p'`
		if [ "$BUG" = "" ]
		then
		TO=dev-public@mysql.com
		# TO=dev-public@mysql.com
		BS=""
		BH=""
		else
		TO=dev-bugs@mysql.com
		# TO=dev-bugs@mysql.com
		BS=" BUG#$BUG"
		# need newline here
		BH="X-Bug: $BUG
		"
		fi

		#++
		# dev-public@ / dev-bugs@
		# commits@ or dev-private@ mail
		#--
		echo "Commit successful, notifying developers at $TO"
		(
		cat <<EOF
		List-ID: <bk.mysql-$VERSION>
		From: $FROM
		To: $TO
		Subject: bk commit - $VERSION tree ($CHANGESET)${BS}${WL}
		X-CSetKey: <$CSETKEY>
		$BH
		EOF
		bk changes -v -r+
		bk cset -r+ -d
		) > $BKROOT/BitKeeper/tmp/dev_public.txt

		$SENDMAIL -t < $BKROOT/BitKeeper/tmp/dev_public.txt
		LIST="commits"
		TO="commits@lists.mysql.com"
		if [ -f .tree-is-private ]
		then
		LIST="dev-private"
		TO="dev-private@mysql.com"
		fi

		#++
		# commits@ mail
		#--
		echo "Notifying commits list at $COMMITS"
		echo "Notifying $LIST list at $TO"
		(
		cat <<EOF
		List-ID: <bk.mysql-$VERSION>
		From: $FROM
		To: $COMMITS
		To: $TO
		Subject: bk commit into $VERSION tree ($CHANGESET)$BS
		X-CSetKey: <$CSETKEY>
		$BH
		@@ -98,7 +96,7 @@ see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

		EOF
		bk changes -v -r+
		bk cset -r+ -d
		bk rset -r+ -ah \| bk gnupatch -h -dup -T
		) \| bk sed -e ${LIMIT}q > $BKROOT/BitKeeper/tmp/commits.txt

		$SENDMAIL -t < $BKROOT/BitKeeper/tmp/commits.txt
		@@ -120,7 +118,7 @@ Subject: bk commit - $VERSION tree (Manual) ($CHANGESET)$BS

		EOF
		bk changes -v -r+
		bk cset -r+ -d
		bk rset -r+ -ah \| bk gnupatch -h -dup -T
		) > $BKROOT/BitKeeper/tmp/docs.txt
		$SENDMAIL -t < $BKROOT/BitKeeper/tmp/docs.txt
		fi

CMakeLists.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -158,10 +158,10 @@ IF(EMBED_MANIFESTS)
		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(tmp_manifest)
		ENDIF(NOT tmp_manifest)
		# Set the processor architecture.
		IF(CMAKE_GENERATOR MATCHES "Visual Studio 8 2005 Win64")
		SET(PROCESSOR_ARCH "X64")
		SET(PROCESSOR_ARCH "amd64")
		ELSE(CMAKE_GENERATOR MATCHES "Visual Studio 8 2005 Win64")
		SET(PROCESSOR_ARCH "X86")
		ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 8 2005 Win64")