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

.bzrignore

+12 −0

Original line number	Diff line number	Diff line
		@@ -245,6 +245,7 @@ libmysqld/get_password.c
		libmysqld/ha_berkeley.cc
		libmysqld/ha_heap.cc
		libmysqld/ha_innobase.cc
		libmysqld/ha_innodb.cc
		libmysqld/ha_isam.cc
		libmysqld/ha_isammrg.cc
		libmysqld/ha_myisam.cc
		@@ -344,7 +345,13 @@ mysql-test/gmon.out
		mysql-test/install_test_db
		mysql-test/mysql-test-run
		mysql-test/r/*.reject
		mysql-test/r/rpl000002.eval
		mysql-test/r/rpl000014.eval
		mysql-test/r/rpl000015.eval
		mysql-test/r/rpl000016.eval
		mysql-test/r/rpl_log.eval
		mysql-test/r/slave-running.eval
		mysql-test/r/slave-stopped.eval
		mysql-test/share/mysql
		mysql-test/var/*
		mysql.kdevprj
		@@ -451,3 +458,8 @@ 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

+1 −0

Original line number	Diff line number	Diff line
		cflags="$c_warnings $extra_flags"
		cxxflags="$cxx_warnings $base_cxxflags $extra_flags"
		extra_configs="$extra_configs $local_infile_configs"
		configure="./configure $base_configs $extra_configs"
		for arg
		do

+0 −1

Original line number	Diff line number	Diff line
		@@ -35,7 +35,6 @@ EXTRA_DIST = FINISH.sh \
		compile-pentium-myodbc \
		compile-pentium-mysqlfs-debug \
		compile-pentium-pgcc \
		compile-pentium-symbols \
		compile-solaris-sparc \
		compile-solaris-sparc-debug \
		compile-solaris-sparc-fortre \

+6 −2

Original line number	Diff line number	Diff line
		@@ -52,11 +52,15 @@ debug_cflags="-DEXTRA_DEBUG -DFORCE_INIT_OF_VARS -DSAFEMALLOC -DSAFE_MUTEX -O1"

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

		base_configs="--prefix=/usr/local/mysql --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client --with-mysqld-ldflags=-all-static \
		--with-client-ldflags=-all-static"
		base_configs="--prefix=/usr/local/mysql --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client"
		static_link="--with-mysqld-ldflags=-all-static --with-client-ldflags=-all-static"
		alpha_configs="" # Not used yet
		pentium_configs=""
		sparc_configs=""
		# we need local-infile in all binaries for rpl000001
		# if you need to disable local-infile in the client, write a build script
		# and unset local_infile_configs
		local_infile_configs="--enable-local-infile"

		debug_configs="--with-debug"

+1 −1

Original line number	Diff line number	Diff line
		@@ -4,6 +4,6 @@ path=`dirname $0`
		. "$path/SETUP.sh"

		extra_flags="$alpha_cflags $fast_cflags"
		extra_configs="$alpha_configs"
		extra_configs="$alpha_configs $static_link"

		. "$path/FINISH.sh"