Commit 8e882bca authored May 02, 2001 by serg@serg.mysql.com

Merge

parents cd42be3b 9ee2a297

.bzrignore

+1 −0

Original line number	Diff line number	Diff line
		@@ -315,3 +315,4 @@ libmysqld/time.cc
		libmysqld/unireg.cc
		linked_libmysqld_sources
		sql-bench/bench-count-distinct
		libmysqld/sql_handler.cc

BUILD/SETUP.sh

+2 −2

Original line number	Diff line number	Diff line
		@@ -43,8 +43,8 @@ alpha_cflags="-mcpu=ev6 -Wa,-mev6" # Not used yet
		pentium_cflags="-mpentiumpro"
		sparc_cflags=""

		fast_cflags="-O6 -fno-omit-frame-pointer"
		reckless_cflags="-O6 -fomit-frame-pointer -ffixed-ebp"
		fast_cflags="-O3 -fno-omit-frame-pointer"
		reckless_cflags="-O3 -fomit-frame-pointer -ffixed-ebp"
		debug_cflags="-DEXTRA_DEBUG -DFORCE_INIT_OF_VARS -DSAFEMALLOC -DSAFE_MUTEX -O2"

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

BUILD/compile-pentium-max

100644 → 100755

+0 −0

File mode changed from 100644 to 100755.

BitKeeper/etc/logging_ok

+1 −0

Original line number	Diff line number	Diff line
		heikki@donna.mysql.fi
		jcole@abel.spaceapes.com
		monty@donna.mysql.fi
		monty@work.mysql.com
		paul@central.snake.net

Build-tools/Do-patch-file

+2 −0

Original line number	Diff line number	Diff line
		@@ -14,6 +14,7 @@ OLD="mysql-$PVER.tar.gz"
		RESULT="mysql-$PVER-$VER.patch.gz"
		PATCH_DIR=/my/web/Downloads-live/Patches
		RESULT_DIR=/my/web/Downloads-live/MySQL-3.23
		RESULT_DIR_MAX=/my/web/Downloads-live/MySQL-Max-3.23

		if test ! -f $NEWDIR/$NEW
		then
		@@ -39,4 +40,5 @@ chmod a+r,o-w $RESULT binary/*
		mv $RESULT $PATCH_DIR
		cp binary/mysqlcom-* binary/mysqlwin /net/web/home/production/data/nweb/customer/Downloads
		rm binary/mysqlcom-*
		mv binary/Max $RESULT_DIR_MAX
		cp binary/* $RESULT_DIR