Commit 41bc28ae authored by joerg@trift2.'s avatar joerg@trift2.
Browse files

Merge trift2.:/MySQL/M50/mysql-5.0 

into  trift2.:/MySQL/M50/push-5.0
parents 9f234274 4e9d181f

BitKeeper/triggers/post-commit

+2 −2
Original line number Diff line number Diff line
@@ -96,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
@@ -118,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

Makefile.am

+8 −0
Original line number Diff line number Diff line
@@ -159,6 +159,14 @@ test-bt: 
	@PERL@ ./mysql-test-run.pl --force --comment=funcs2 --suite=funcs_2

	-cd mysql-test ; MTR_BUILD_THREAD=auto \

	@PERL@ ./mysql-test-run.pl --force --comment=rowlock --suite=row_lock

	-if [ -d mysql-test/suite/nist ] ; then \

	  cd mysql-test ; MTR_BUILD_THREAD=auto \

	  @PERL@ ./mysql-test-run.pl --comment=NIST+normal --force --suite=nist ; \

	fi

	-if [ -d mysql-test/suite/nist ] ; then \

	  cd mysql-test ; MTR_BUILD_THREAD=auto \

	  @PERL@ ./mysql-test-run.pl --comment=NIST+ps --force --suite=nist --ps-protocol ; \

	fi



test-bt-debug:

	-cd mysql-test ; MTR_BUILD_THREAD=auto \

libmysqld/libmysqld.def

+2 −2
Original line number Diff line number Diff line
@@ -29,8 +29,8 @@ EXPORTS 
	my_print_variables

	my_realloc

	my_strdup

	my_thread_end

	my_thread_init

	mysql_thread_end

	mysql_thread_init

	myodbc_remove_escape

	mysql_affected_rows

	mysql_autocommit