database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-5.0

Browse Source 
into  mysql.com:/nfstmp1/jwinstead/mysql-5.0-clean
This commit is contained in:
jimw@mysql.com
2006-04-28 00:33:47 +02:00
parent 480a55287d 0b8d17aae0
commit b1c3801047
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mysql-test/mysql-test-run.pl
View File

@ -255,6 +255,7 @@ our $opt_result_ext;
our $opt_skip; our $opt_skip;
our $opt_skip_rpl; our $opt_skip_rpl;
our $use_slaves;
our $opt_skip_test; our $opt_skip_test;
our $opt_skip_im; our $opt_skip_im;
@ -406,16 +407,15 @@ sub main () {
my $tests= collect_test_cases($opt_suite); my $tests= collect_test_cases($opt_suite);
# Turn off NDB and other similar options if no tests use it # Turn off NDB and other similar options if no tests use it
my ($need_ndbcluster,$need_im,$need_slave); my ($need_ndbcluster,$need_im);
foreach my $test (@$tests) foreach my $test (@$tests)
{ {
$need_ndbcluster||= $test->{ndb_test}; $need_ndbcluster||= $test->{ndb_test};
$need_im||= $test->{component_id} eq 'im'; $need_im||= $test->{component_id} eq 'im';
$need_slave||= $test->{slave_num}; $use_slaves||= $test->{slave_num};
} }
$opt_with_ndbcluster= 0 unless $need_ndbcluster; $opt_with_ndbcluster= 0 unless $need_ndbcluster;
$opt_skip_im= 1 unless $need_im; $opt_skip_im= 1 unless $need_im;
$opt_skip_rpl= 1 unless $need_slave;
snapshot_setup(); snapshot_setup();
initialize_servers(); initialize_servers();
@ -974,7 +974,7 @@ sub snapshot_setup () {
$master->[0]->{'path_myddir'}, $master->[0]->{'path_myddir'},
$master->[1]->{'path_myddir'}); $master->[1]->{'path_myddir'});
unless ($opt_skip_rpl) if ($use_slaves)
{ {
push @data_dir_lst, ($slave->[0]->{'path_myddir'}, push @data_dir_lst, ($slave->[0]->{'path_myddir'},
$slave->[1]->{'path_myddir'}, $slave->[1]->{'path_myddir'},
@ -1661,7 +1661,7 @@ sub mysql_install_db () {
install_db('master', $master->[0]->{'path_myddir'}); install_db('master', $master->[0]->{'path_myddir'});
install_db('master', $master->[1]->{'path_myddir'}); install_db('master', $master->[1]->{'path_myddir'});
if ( ! $opt_skip_rpl ) if ( $use_slaves )
{ {
install_db('slave', $slave->[0]->{'path_myddir'}); install_db('slave', $slave->[0]->{'path_myddir'});
install_db('slave', $slave->[1]->{'path_myddir'}); install_db('slave', $slave->[1]->{'path_myddir'});