updated mysql-test-run.pl to adjust to ndb replication testing

parent 495ad634
...@@ -1670,3 +1670,5 @@ storage/ndb/test/ndbapi/testPartitioning ...@@ -1670,3 +1670,5 @@ storage/ndb/test/ndbapi/testPartitioning
storage/ndb/test/ndbapi/testReadPerf storage/ndb/test/ndbapi/testReadPerf
storage/ndb/test/ndbapi/test_event_merge storage/ndb/test/ndbapi/test_event_merge
storage/ndb/test/tools/listen_event storage/ndb/test/tools/listen_event
libmysqld/ha_ndbcluster_binlog.cc
libmysqld/rpl_injector.cc
...@@ -252,6 +252,16 @@ sub collect_one_test_case($$$$$$$) { ...@@ -252,6 +252,16 @@ sub collect_one_test_case($$$$$$$) {
$tinfo->{'slave_restart'}= 1; $tinfo->{'slave_restart'}= 1;
} }
if ( ( $::opt_with_ndbcluster or $::glob_use_running_ndbcluster ) and
defined mtr_match_substring($tname,"ndb") )
{
$tinfo->{'ndb_test'}= 1;
}
else
{
$tinfo->{'ndb_test'}= 0;
}
# FIXME what about embedded_server + ndbcluster, skip ?! # FIXME what about embedded_server + ndbcluster, skip ?!
my $master_opt_file= "$testdir/$tname-master.opt"; my $master_opt_file= "$testdir/$tname-master.opt";
......
...@@ -50,6 +50,23 @@ sub mtr_match_extension ($$) { ...@@ -50,6 +50,23 @@ sub mtr_match_extension ($$) {
} }
# Match a substring anywere in a string
sub mtr_match_substring ($$) {
my $string= shift;
my $substring= shift;
if ( $string =~ /(.*)\Q$substring\E(.*)$/ ) # strncmp
{
return $1;
}
else
{
return undef; # NULL
}
}
sub mtr_match_any_exact ($$) { sub mtr_match_any_exact ($$) {
my $string= shift; my $string= shift;
my $mlist= shift; my $mlist= shift;
......
...@@ -28,7 +28,7 @@ sub run_stress_test () ...@@ -28,7 +28,7 @@ sub run_stress_test ()
if ( ! $::glob_use_embedded_server and ! $::opt_local_master ) if ( ! $::glob_use_embedded_server and ! $::opt_local_master )
{ {
$::master->[0]->{'pid'}= mysqld_start('master',0,[],[]); $::master->[0]->{'pid'}= mysqld_start('master',0,[],[],0);
if ( ! $::master->[0]->{'pid'} ) if ( ! $::master->[0]->{'pid'} )
{ {
mtr_error("Can't start the mysqld server"); mtr_error("Can't start the mysqld server");
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment