Merge jcole@work.mysql.com:/home/bk/mysql-4.0 (54b0d014) · Commits · Software / OSDI20 Artifacts / mariadb

.bzrignore

+4 −0

Original line number	Diff line number	Diff line
		@@ -463,3 +463,7 @@ mysql-test/r/rpl000001.eval
		Docs/safe-mysql.xml
		mysys/test_vsnprintf
		Docs/manual.de.log
		Docs/internals.info
		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

+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"

+108 −81

File changed.

Preview size limit exceeded, changes collapsed.

+6 −1

Original line number	Diff line number	Diff line
		@@ -6,6 +6,7 @@ Sinisa@sinisa.nasamreza.org
		ahlentz@co3064164-a.rochd1.qld.optusnet.com.au
		arjen@co3064164-a.bitbike.com
		arjen@fred.bitbike.com
		arjen@george.bitbike.com
		bell@sanja.is.com.ua
		davida@isil.mysql.com
		heikki@donna.mysql.fi
		@@ -20,11 +21,15 @@ jcole@sarvik.tfr.cafe.ee
		jcole@tetra.spaceapes.com
		jorge@linux.jorge.mysql.com
		kaj@work.mysql.com
		lenz@kallisto.mysql.com
		lenz@mysql.com
		miguel@hegel.local
		miguel@light.local
		monty@bitch.mysql.fi
		monty@donna.mysql.fi
		monty@hundin.mysql.fi
		monty@narttu.
		monty@narttu.mysql.fi
		monty@tik.mysql.fi
		monty@tramp.mysql.fi
		monty@work.mysql.com
		@@ -51,4 +56,4 @@ tonu@x3.internalnet
		venu@work.mysql.com
		zak@balfor.local
		zak@linux.local
		arjen@george.bitbike.com
		jani@dsl-jkl1657.dial.inet.fi

+2 −1

Original line number	Diff line number	Diff line
		@@ -59,8 +59,9 @@ EOF

		#++
		# docs-commit@ mail
		# Picks up anything under the Docs subdirectory (relevant for docs team).
		#--
		bk changes -v -r+ \| grep -q Docs/manual.texi
		bk changes -v -r+ \| grep -q " Docs/"
		if [ $? -eq 0 ]
		then
		echo "Notifying docs list at $DOCS"