Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas 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.2134 06/02/06 15:42:26 tomas@stripped +3 -0
harmonized mysql-test-run.sh and .pl
+ added current test printout to error file
mysql-test/mysql-test-run.sh
1.294 06/02/06 15:42:18 tomas@stripped +8 -2
harmonized mysql-test-run.sh and .pl
+ added current test printout to error file
mysql-test/mysql-test-run.pl
1.61 06/02/06 15:42:18 tomas@stripped +15 -4
harmonized mysql-test-run.sh and .pl
+ added current test printout to error file
mysql-test/lib/mtr_cases.pl
1.14 06/02/06 15:42:18 tomas@stripped +6 -1
harmonized mysql-test-run.sh and .pl
# 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: tomas
# Host: poseidon.ndb.mysql.com
# Root: /home/tomas/mysql-5.1-new
--- 1.293/mysql-test/mysql-test-run.sh 2006-01-30 17:06:24 +01:00
+++ 1.294/mysql-test/mysql-test-run.sh 2006-02-06 15:42:18 +01:00
@@ -630,7 +630,7 @@
NDBCLUSTER_OPTS="--port=$NDBCLUSTER_PORT --data-dir=$MYSQL_TEST_DIR/var --ndb_mgm-extra-opts=$NDB_MGM_EXTRA_OPTS --ndb_mgmd-extra-opts=$NDB_MGMD_EXTRA_OPTS --ndbd-extra-opts=$NDBD_EXTRA_OPTS"
NDBCLUSTER_OPTS_SLAVE="--port=$NDBCLUSTER_PORT_SLAVE --data-dir=$MYSQL_TEST_DIR/var"
if [ -n "$USE_NDBCLUSTER_SLAVE" ] ; then
- USE_NDBCLUSTER_SLAVE="$USE_NDBCLUSTER_SLAVE --ndb-connectstring=localhost:$NDBCLUSTER_PORT_SLAVE"
+ USE_NDBCLUSTER_SLAVE="$USE_NDBCLUSTER_SLAVE --ndb-connectstring=localhost:$NDBCLUSTER_PORT_SLAVE --ndb-extra-logging"
fi
NDB_BACKUP_DIR=$MYSQL_TEST_DIR/var/ndbcluster-$NDBCLUSTER_PORT
NDB_TOOLS_OUTPUT=$MYSQL_TEST_DIR/var/log/ndb_tools.log
@@ -1016,6 +1016,10 @@
report_current_test () {
tname=$1
echo "CURRENT_TEST: $tname" >> $MASTER_MYERR
+ eval "master1_running=\$MASTER1_RUNNING"
+ if [ x$master1_running = x1 ] ; then
+ echo "CURRENT_TEST: $tname" >> $MASTER_MYERR"1"
+ fi
if [ -n "$PURIFY_LOGS" ] ; then
for log in $PURIFY_LOGS
do
@@ -1297,7 +1301,7 @@
NDB_CONNECTSTRING="$USE_RUNNING_NDBCLUSTER"
echo "Using ndbcluster at $NDB_CONNECTSTRING"
fi
- USE_NDBCLUSTER_OPT="$USE_NDBCLUSTER --ndb-connectstring=\"$NDB_CONNECTSTRING\""
+ USE_NDBCLUSTER_OPT="$USE_NDBCLUSTER --ndb-connectstring=\"$NDB_CONNECTSTRING\" --ndb-extra-logging"
export NDB_CONNECTSTRING
fi
}
@@ -1876,6 +1880,7 @@
start_ndbcluster
start_master
if [ x$USING_NDBCLUSTER = x1 -a -z "$DO_BENCH" -a -z "$DO_STRESS" ] ; then
+ echo "CURRENT_TEST: $tname" >> $MASTER_MYERR"1"
start_master 1
fi
TZ=$MY_TZ; export TZ
@@ -1903,6 +1908,7 @@
start_ndbcluster
start_master
if [ x$USING_NDBCLUSTER = x1 -a -z "$DO_BENCH" -a -z "$DO_STRESS" ] ; then
+ echo "CURRENT_TEST: $tname" >> $MASTER_MYERR"1"
start_master 1
fi
else
--- 1.13/mysql-test/lib/mtr_cases.pl 2006-01-13 03:13:46 +01:00
+++ 1.14/mysql-test/lib/mtr_cases.pl 2006-02-06 15:42:18 +01:00
@@ -253,12 +253,17 @@
}
if ( ( $::opt_with_ndbcluster or $::glob_use_running_ndbcluster ) and
- defined mtr_match_substring($tname,"ndb") )
+ ( $::opt_with_ndbcluster_all or defined mtr_match_substring($tname,"ndb") ))
{
$tinfo->{'ndb_test'}= 1;
}
else
{
+ if ( $::opt_with_ndbcluster_only )
+ {
+ $tinfo->{'skip'}= 1;
+ return;
+ }
$tinfo->{'ndb_test'}= 0;
}
--- 1.60/mysql-test/mysql-test-run.pl 2006-02-02 16:12:09 +01:00
+++ 1.61/mysql-test/mysql-test-run.pl 2006-02-06 15:42:18 +01:00
@@ -304,11 +304,13 @@
our $opt_udiff;
-our $opt_skip_ndbcluster;
+our $opt_skip_ndbcluster= 0;
our $opt_with_ndbcluster;
-our $opt_skip_ndbcluster_slave;
+our $opt_skip_ndbcluster_slave= 0;
our $opt_with_ndbcluster_slave;
-our $opt_ndb_extra_test;
+our $opt_with_ndbcluster_all= 0;
+our $opt_with_ndbcluster_only= 0;
+our $opt_ndb_extra_test= 0;
our $exe_ndb_mgm;
our $path_ndb_tools_dir;
@@ -548,6 +550,8 @@
'with-ndbcluster-slave' => \$opt_with_ndbcluster_slave,
'skip-ndbcluster-slave|skip-ndb-slave'
=> \$opt_skip_ndbcluster_slave,
+ 'with-ndbcluster-all' => \$opt_with_ndbcluster_all,
+ 'with-ndbcluster-only' => \$opt_with_ndbcluster_only,
'ndb-extra-test' => \$opt_ndb_extra_test,
'do-test=s' => \$opt_do_test,
'suite=s' => \$opt_suite,
@@ -1938,6 +1942,10 @@
mtr_report_test_name($tinfo);
mtr_tofile($master->[0]->{'path_myerr'},"CURRENT_TEST: $tname\n");
+ if ( $master->[1]->{'pid'} )
+ {
+ mtr_tofile($master->[1]->{'path_myerr'},"CURRENT_TEST: $tname\n");
+ }
# FIXME test cases that depend on each other, prevent this from
# being at this location.
@@ -1986,6 +1994,7 @@
}
if ( $using_ndbcluster_master and ! $master->[1]->{'pid'} )
{
+ mtr_tofile($master->[1]->{'path_myerr'},"CURRENT_TEST: $tname\n");
$master->[1]->{'pid'}=
mysqld_start('master',1,$tinfo->{'master_opt'},[],
$using_ndbcluster_master);
@@ -3038,7 +3047,9 @@
Options to control what test suites or cases to run
force Continue to run the suite after failure
- with-ndbcluster Use cluster, and enable test cases that requres it
+ with-ndbcluster Use cluster, and enable test cases that requires it
+ with-ndbcluster-all Use cluster in all tests
+ with-ndbcluster-only Run only tests that include "ndb" in the filename
skip-ndb[cluster] Skip the ndb test cases, don't start cluster
do-test=PREFIX Run test cases which name are prefixed with PREFIX
start-from=PREFIX Run test cases starting from test prefixed with PREFIX
| Thread |
|---|
| • bk commit into 5.1 tree (tomas:1.2134) | tomas | 6 Feb |
