Commit 20ab3dc9 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/push-4.1 


Build-tools/Do-compile:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
parents dd843ee4 ae2542b6

Build-tools/Do-compile

+3 −3
Original line number Diff line number Diff line
@@ -392,13 +392,13 @@ if ($opt_stage <= 5 && !$opt_no_test && !$opt_no_mysqltest) 
  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 @@ if ($opt_stage <= 5 && !$opt_no_test && !$opt_no_mysqltest) 
    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.

}

mysql-test/mysql-test-run.sh

+1 −1
Original line number Diff line number Diff line
@@ -850,7 +850,7 @@ report_stats () { 
	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."