From ff85ba77be066607baac0dc16ee59e7174b9cb72 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 6 Apr 2006 18:42:07 +0200 Subject: [PATCH 1/4] Backport of 5.1 test options "--with-ndbcluster" and "--with-ndbcluster-only" as dummies (ignored). mysql-test/mysql-test-run.sh: Make "mysql-test-run.sh" accept (and ignore) the options "--with-ndbcluster" and "--with-ndbcluster-only". This is necessary because newer build tools will issue them, and the test script should tolerate that. Backport from 5.1 (Tomas Ulin, 2006-01-17) --- mysql-test/mysql-test-run.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index 5853ffa201c..64eaaab9fa4 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -230,6 +230,9 @@ FAILED_CASES= EXTRA_MASTER_OPT="" EXTRA_MYSQL_TEST_OPT="" USE_RUNNING_SERVER=1 +# backport from 5.1, disabled - this substitution is not done in 4.0 +# USE_NDBCLUSTER=@USE_NDBCLUSTER@ +# USE_NDBCLUSTER_ONLY=0 DO_GCOV="" DO_GDB="" MANUAL_GDB="" @@ -259,6 +262,14 @@ while test $# -gt 0; do SLAVE_MYSQLD=`$ECHO "$1" | $SED -e "s;--slave-binary=;;"` ;; --local) USE_RUNNING_SERVER="" ;; --extern) USE_RUNNING_SERVER="1" ;; + --with-ndbcluster) +# USE_NDBCLUSTER="--ndbcluster" ;; + $ECHO "Option '--with-ndbcluster' is ignored in this version" ;; + --with-ndbcluster-only) +# USE_NDBCLUSTER="--ndbcluster" +# USE_NDBCLUSTER_SLAVE="--ndbcluster" +# USE_NDBCLUSTER_ONLY=1 ;; + $ECHO "Option '--with-ndbcluster-only' is ignored in this version" ;; --tmpdir=*) MYSQL_TMP_DIR=`$ECHO "$1" | $SED -e "s;--tmpdir=;;"` ;; --local-master) MASTER_MYPORT=3306; From 8fc0c48d5e929e7dcd38721a220d03c0f0979c74 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 7 Apr 2006 13:02:15 +0200 Subject: [PATCH 2/4] Perl test script: Avoid some aborts, which made the whole build/test process terminate. mysql-test/lib/mtr_process.pl: Change from "mtr_error()" to "mtr_warning()" on some problems, because "error" makes the whole suite abort which then makes "Do-compile" terminate, so none of the following steps (including other etst suites) will be done. --- mysql-test/lib/mtr_process.pl | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/mysql-test/lib/mtr_process.pl b/mysql-test/lib/mtr_process.pl index 4da608ad345..662b70a4fee 100644 --- a/mysql-test/lib/mtr_process.pl +++ b/mysql-test/lib/mtr_process.pl @@ -454,8 +454,7 @@ sub mtr_kill_leftovers () { if ( kill(0, @pids) ) # Check if some left { - # FIXME maybe just mtr_warning() ? - mtr_error("can't kill process(es) " . join(" ", @pids)); + mtr_warning("can't kill process(es) " . join(" ", @pids)); } } } @@ -468,7 +467,7 @@ sub mtr_kill_leftovers () { { if ( mtr_ping_mysqld_server($srv->{'port'}, $srv->{'sockfile'}) ) { - mtr_error("can't kill old mysqld holding port $srv->{'port'}"); + mtr_warning("can't kill old mysqld holding port $srv->{'port'}"); } } } From 7bb18828225628776ba908649b65e764a2533cde Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 7 Apr 2006 13:34:39 +0200 Subject: [PATCH 3/4] mysql-test/mysql-test-run.pl : Add option "with-ndbcluster-only" (ignored). mysql-test/mysql-test-run.pl: Add option "with-ndbcluster-only" (ignored) for compatibility with newer "Do-compile". --- mysql-test/mysql-test-run.pl | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index d4f759604dd..53bf820cce9 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -277,6 +277,8 @@ our $opt_udiff; our $opt_skip_ndbcluster; our $opt_with_ndbcluster; +our $opt_with_ndbcluster_only= 0; # dummy, ignored + our $opt_with_openssl; our $exe_ndb_mgm; @@ -512,6 +514,7 @@ sub command_line_setup () { 'force' => \$opt_force, 'with-ndbcluster' => \$opt_with_ndbcluster, 'skip-ndbcluster|skip-ndb' => \$opt_skip_ndbcluster, + 'with-ndbcluster-only' => \$opt_with_ndbcluster_only, 'do-test=s' => \$opt_do_test, 'suite=s' => \$opt_suite, 'skip-rpl' => \$opt_skip_rpl, @@ -596,6 +599,11 @@ sub command_line_setup () { print '#' x 78, "\n\n"; } + if ( $opt_with_ndbcluster_only ) + { + print "# Option '--with-ndbcluster-only' is ignored in this release.\n"; + } + foreach my $arg ( @ARGV ) { if ( $arg =~ /^--skip-/ ) From 747f81c22c3099860ed0babe1993083d3c827013 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 7 Apr 2006 19:27:19 +0200 Subject: [PATCH 4/4] mysql-test/mysql-test-run.sh : Provide info about the options used. mysql-test/mysql-test-run.sh: Provide info about the options used for this run to any evaluation tool. --- mysql-test/mysql-test-run.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index 64eaaab9fa4..f1f146e18a9 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -250,6 +250,8 @@ START_WAIT_TIMEOUT=10 STOP_WAIT_TIMEOUT=10 MYSQL_TEST_SSL_OPTS="" +$ECHO "Logging: $0 $*" # To ensure we see all arguments in the output, for the test analysis tool + while test $# -gt 0; do case "$1" in --user=*) DBUSER=`$ECHO "$1" | $SED -e "s;--user=;;"` ;;