Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0

into mysql.com:/home/hf/work/mysql-5.0.9551


BitKeeper/deleted/.del-ctype_cp932.result:
  Auto merged
BitKeeper/deleted/.del-ctype_cp932.test:
  Auto merged

BUILD/compile-pentium64-debug-max

@@ -0,0 +1,13 @@
+#! /bin/sh
+
+path=`dirname $0`
+. "$path/SETUP.sh" $@ --with-debug=full
+
+extra_flags="$pentium64_cflags $debug_cflags $max_cflags"
+c_warnings="$c_warnings $debug_extra_warnings"
+cxx_warnings="$cxx_warnings $debug_extra_warnings"
+extra_configs="$pentium_configs $debug_configs $max_configs"
+
+extra_configs="$extra_configs "
+
+. "$path/FINISH.sh"

Makefile.am

@@ -112,7 +112,7 @@ test:
 
 test-force:
 	cd mysql-test; \
-	./mysql-test-run --force ; \
+	./mysql-test-run --force && \
 	./mysql-test-run --ps-protocol --force
 
 # We are testing a new Perl version of the test script
@@ -123,7 +123,7 @@ test-pl:
 
 test-force-pl:
 	cd mysql-test; \
-	./mysql-test-run.pl --force ; \
+	./mysql-test-run.pl --force && \
 	./mysql-test-run.pl --ps-protocol --force
 
 # Don't update the files from bitkeeper

mysql-test/mysql-test-run.sh

@@ -223,10 +223,10 @@ MYSQL_MANAGER_USER=root
 # number is to be used, 0 - 16 or similar.
 #
 if [ -n "$MTR_BUILD_THREAD" ] ; then
-  MASTER_MYPORT=`expr $MTR_BUILD_THREAD '*' 40 + 8120`
+  MASTER_MYPORT=`expr $MTR_BUILD_THREAD '*' 5 + 10000`
   MYSQL_MANAGER_PORT=`expr $MASTER_MYPORT + 2`
-  SLAVE_MYPORT=`expr $MASTER_MYPORT + 16`
-  NDBCLUSTER_PORT=`expr $MASTER_MYPORT + 24`
+  SLAVE_MYPORT=`expr $MASTER_MYPORT + 3`
+  NDBCLUSTER_PORT=`expr $MASTER_MYPORT + 4`
 
   echo "Using MTR_BUILD_THREAD   = $MTR_BUILD_THREAD"
   echo "Using MASTER_MYPORT      = $MASTER_MYPORT"

mysql-test/t/disabled.def

@@ -16,3 +16,4 @@ rpl_until       : Unstable test case, bug#12429
 rpl_deadlock    : Unstable test case, bug#12429
 kill            : Unstable test case, bug#9712
 archive_gis     : The test fails on 32bit Linux
+ctype_cp932_binlog : The test is not ready yet. hf will complete shortly