bk commit into 4.1 tree (joerg:1.2065)

[Joerg Bruehe]

Below is the list of changes that have just been committed into a local
4.1 repository of joerg. When joerg does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2065 05/03/03 13:04:44 joerg@stripped +2 -0
  Ensure that the tests with '--ps-protocol' and '--embedded-server' are taken even
  after the previous run had some failures, provided it did not totally crash.

  mysql-test/mysql-test-run.sh
    1.243 05/03/03 13:04:39 joerg@stripped +1 -1
    Change the message even after test failures so that it is fairly safe to identify
    the end of the run from it (as opposed to a crash of the script).
    It is essential that both a run without any and with some test failures
    write "were successful" so that it can be grepped.

  Build-tools/Do-compile
    1.105 05/03/03 13:04:39 joerg@stripped +3 -3
    Change the search string for a test run from "tests were successful" to just
    "were successful", which is written by the test run even after some failures.
    This is necessary to start the next test suite ('--ps-protocol', '--embedded-server')
    even after the previous one had some test failures.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	joerg
# Host:	trift2.
# Root:	/M41/push-4.1

--- 1.104/Build-tools/Do-compile	Fri Feb 11 10:40:07 2005
+++ 1.105/Build-tools/Do-compile	Thu Mar  3 13:04:39 2005
@@ -392,13 +392,13 @@
   info("Running test suite");
   system("mkdir $bench_tmpdir") if (! -d $bench_tmpdir);
   safe_cd("${test_dir}/mysql-test");
-  check_system("./mysql-test-run $flags --tmpdir=$bench_tmpdir --master_port=$mysql_tcp_port --slave_port=$slave_port --ndbcluster_port=$ndbcluster_port --manager-port=$manager_port --no-manager --sleep=10", "tests were successful");
+  check_system("./mysql-test-run $flags --tmpdir=$bench_tmpdir --master_port=$mysql_tcp_port --slave_port=$slave_port --ndbcluster_port=$ndbcluster_port --manager-port=$manager_port --no-manager --sleep=10", "were successful");
 
   unless ($opt_skip_ps_test)
   {
     log_timestamp();
     info("Running test suite using prepared statements");
-    check_system("./mysql-test-run $flags --ps-protocol --tmpdir=$bench_tmpdir --master_port=$mysql_tcp_port --slave_port=$slave_port --ndbcluster_port=$ndbcluster_port --manager-port=$manager_port --no-manager --sleep=10", "tests were successful");
+    check_system("./mysql-test-run $flags --ps-protocol --tmpdir=$bench_tmpdir --master_port=$mysql_tcp_port --slave_port=$slave_port --ndbcluster_port=$ndbcluster_port --manager-port=$manager_port --no-manager --sleep=10", "were successful");
   }
   
   unless ($opt_skip_embedded_test)
@@ -407,7 +407,7 @@
     info("Running embedded server test suite");
     # Embedded server and NDB don't jive
     $flags=~ s/ --with-ndbcluster//;
-    check_system("./mysql-test-run $flags --embedded-server --tmpdir=$bench_tmpdir --master_port=$mysql_tcp_port --slave_port=$slave_port --manager-port=$manager_port --no-manager --sleep=10", "tests were successful");
+    check_system("./mysql-test-run $flags --embedded-server --tmpdir=$bench_tmpdir --master_port=$mysql_tcp_port --slave_port=$slave_port --manager-port=$manager_port --no-manager --sleep=10", "were successful");
   }
   # 'mysql-test-run' writes its own final message for log evaluation.
 }

--- 1.242/mysql-test/mysql-test-run.sh	Tue Feb 22 11:51:19 2005
+++ 1.243/mysql-test/mysql-test-run.sh	Thu Mar  3 13:04:39 2005
@@ -833,7 +833,7 @@
 	whole=`$PRINTF %.2s $raw`
 	xwhole=`$EXPR $whole \* 100`
 	deci=`$EXPR $raw - $xwhole`
-	$ECHO  "Failed ${TOT_FAIL}/${TOT_TEST} tests, ${whole}.${deci}% successful."
+	$ECHO  "Failed ${TOT_FAIL}/${TOT_TEST} tests, ${whole}.${deci}% were successful."
 	$ECHO ""
         $ECHO "The log files in $MY_LOG_DIR may give you some hint"
 	$ECHO "of what when wrong."