List:Commits« Previous MessageNext Message »
From:Jim Winstead Date:April 27 2006 5:53pm
Subject:bk commit into 5.0 tree (jimw:1.2100) BUG#19393
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of jimw. When jimw 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.2100 06/04/27 10:53:19 jimw@stripped +1 -0
  Bug #19393: Federated tests fail on Windows under pushbuild
  
    Supplying --skip-rpl to mysql-test-run.pl would always disable the
    slaves, but those slaves may still be needed for the federated tests.
    Now we only disable the slaves when they are not used by any of the
    tests.

  mysql-test/mysql-test-run.pl
    1.90 06/04/27 10:53:15 jimw@stripped +5 -5
    Decide whether to set up and start slave databases based entirely on
    which tests are used, and don't allow --skip-rpl to ruin the party,
    since other tests than replication rely on the slaves (namely federated).

# 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:	jimw
# Host:	rama.(none)
# Root:	/home/jimw/my/mysql-5.0-19393

--- 1.89/mysql-test/mysql-test-run.pl	2006-04-26 11:37:50 -07:00
+++ 1.90/mysql-test/mysql-test-run.pl	2006-04-27 10:53:15 -07:00
@@ -258,6 +258,7 @@
 
 our $opt_skip;
 our $opt_skip_rpl;
+our $use_slaves;
 our $opt_skip_test;
 our $opt_skip_im;
 
@@ -407,16 +408,15 @@
     my $tests= collect_test_cases($opt_suite);
 
     # 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)
     {
       $need_ndbcluster||= $test->{ndb_test};
       $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_skip_im= 1 unless $need_im;
-    $opt_skip_rpl= 1 unless $need_slave;
 
     snapshot_setup();
     initialize_servers();
@@ -981,7 +981,7 @@
     $master->[0]->{'path_myddir'},
     $master->[1]->{'path_myddir'});
 
-  unless ($opt_skip_rpl)
+  if ($use_slaves)
   {
     push @data_dir_lst, ($slave->[0]->{'path_myddir'},
                          $slave->[1]->{'path_myddir'},
@@ -1636,7 +1636,7 @@
   install_db('master', $master->[0]->{'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->[1]->{'path_myddir'});
Thread
bk commit into 5.0 tree (jimw:1.2100) BUG#19393Jim Winstead27 Apr