Merge hundin:/my/mysql-4.0 into bitch.mysql.fi:/my/mysql-4.0 (0653326e) · Commits · Software / OSDI20 Artifacts / mariadb

.bzrignore

+13 −5

Original line number	Diff line number	Diff line
		@@ -38,9 +38,11 @@ COPYING.LIB
		Docs/#manual.texi#
		Docs/INSTALL-BINARY
		Docs/include.texi
		Docs/internals.info
		Docs/manual.aux
		Docs/manual.cp
		Docs/manual.cps
		Docs/manual.de.log
		Docs/manual.dvi
		Docs/manual.fn
		Docs/manual.fns
		@@ -58,6 +60,8 @@ Docs/manual_letter.ps
		Docs/manual_toc.html
		Docs/my_sys.doc
		Docs/mysql.info
		Docs/mysql.xml
		Docs/safe-mysql.xml
		Docs/tex.fmt
		Docs/texi2dvi.out
		INSTALL-SOURCE
		@@ -327,6 +331,8 @@ linked_libmysqldex_sources
		linked_server_sources
		linked_tools_sources
		locked
		mit-pthreads/config.flags
		mit-pthreads/syscall.S
		myisam/FT1.MYD
		myisam/FT1.MYI
		myisam/ft_dump
		@@ -341,10 +347,14 @@ myisam/myisamlog
		myisam/myisampack
		myisam/test1.MYD
		myisam/test1.MYI
		mysql-4.0.2-alpha-pc-linux-gnu-i686.tar.gz
		mysql-4.0.2-alpha.tar.gz
		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/r/*.reject
		mysql-test/r/rpl000001.eval
		mysql-test/r/rpl000002.eval
		mysql-test/r/rpl000014.eval
		mysql-test/r/rpl000015.eval
		@@ -364,6 +374,7 @@ mysys/test_dir
		mysys/test_io_cache
		mysys/test_thr_alarm
		mysys/test_thr_lock
		mysys/test_vsnprintf
		mysys/testhash
		regex/re
		repl-tests/test-repl-ts/repl-timestamp.master.reject
		@@ -458,8 +469,5 @@ vio/test-ssl
		vio/test-sslclient
		vio/test-sslserver
		vio/viotest-ssl
		Docs/mysql.xml
		mysql-test/r/rpl000001.eval
		Docs/safe-mysql.xml
		mysys/test_vsnprintf
		Docs/manual.de.log
		mysys/getopt.c
		mysys/getopt1.c

BUILD/SETUP.sh

+3 −10

Original line number	Diff line number	Diff line
		@@ -34,10 +34,10 @@ AM_MAKEFLAGS="-j 4"
		# The following warning flag will give too many warnings:
		# -Wshadow -Wunused -Winline (The later isn't usable in C++ as
		# __attribute()__ doesn't work with gnu C++)
		global_warnings="-Wimplicit -Wreturn-type -Wid-clash-51 -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wimplicit-function-dec -Wimplicit-int -Wparentheses -Wsign-compare -Wwrite-strings"
		global_warnings="-Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings"
		#debug_extra_warnings="-Wuninitialized"
		c_warnings="$global_warnings -Wunused"
		cxx_warnings="$global_warnings -Woverloaded-virtual -Wextern-inline -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor"
		cxx_warnings="$global_warnings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor"

		alpha_cflags="-mcpu=ev6 -Wa,-mev6" # Not used yet
		pentium_cflags="-mcpu=pentiumpro"
		@@ -71,11 +71,4 @@ else
		make=make
		fi

		if gcc -v 2>&1 \| grep 'version 3' > /dev/null 2>&1
		then
		CXX="gcc -DUSE_MYSYS_NEW"
		CXXLDFLAGS="-Wl,--defsym -Wl,__cxa_pure_virtual=0"
		else
		CXX=gcc
		CXXLDFLAGS=""
		fi

BUILD/compile-pentium-gcov

+2 −1

Original line number	Diff line number	Diff line
		@@ -3,7 +3,8 @@
		path=`dirname $0`
		. "$path/SETUP.sh"

		extra_flags="$pentium_cflags -O2 -fprofile-arcs -ftest-coverage"
		extra_flags="$pentium_cflags -fprofile-arcs -ftest-coverage"
		extra_configs="$pentium_configs $debug_configs --disable-shared $static_link"
		extra_configs="$extra_configs --with-innodb --with-berkeley-db"

		. "$path/FINISH.sh"

BUILD/compile-pentium-max

+2 −1

Original line number	Diff line number	Diff line
		@@ -8,6 +8,7 @@ extra_configs="$pentium_configs"
		strip=yes

		extra_configs="$extra_configs --with-innodb --with-berkeley-db \
		--enable-thread-safe-client --with-openssl --with-vio"
		--with-embedded-server --enable-thread-safe-client \
		--with-openssl --with-vio"

		. "$path/FINISH.sh"

BUILD/compile-solaris-sparc

+1 −1

Original line number	Diff line number	Diff line
		@@ -11,6 +11,6 @@ then
		(cd gemini && aclocal && autoheader && aclocal && automake && autoconf)
		fi

		CFLAGS="-g -Wimplicit -Wreturn-type -Wid-clash-51 -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wimplicit-function-dec -Wimplicit-int -Wparentheses -Wsign-compare -Wwrite-strings -Wunused -O3 -fno-omit-frame-pointer -mcpu=v8 -Wa,-xarch=v8plusa" CXX=gcc CXXFLAGS="-Wimplicit -Wreturn-type -Wid-clash-51 -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wimplicit-function-dec -Wimplicit-int -Wparentheses -Wsign-compare -Wwrite-strings -Woverloaded-virtual -Wextern-inline -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor -felide-constructors -fno-exceptions -fno-rtti -O3 -fno-omit-frame-pointer -mcpu=v8 -Wa,-xarch=v8plusa -g" ./configure --prefix=/usr/local/mysql --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client
		CFLAGS="-g -Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings -Wunused -O3 -fno-omit-frame-pointer -mcpu=v8 -Wa,-xarch=v8plusa" CXX=gcc CXXFLAGS="-Wimplicit -Wreturn-type -Wid-clash-51 -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor -felide-constructors -fno-exceptions -fno-rtti -O3 -fno-omit-frame-pointer -mcpu=v8 -Wa,-xarch=v8plusa -g" ./configure --prefix=/usr/local/mysql --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client

		gmake -j 4