bk commit into maria tree (jani:1.2633)

[jani]

Below is the list of changes that have just been committed into a local
maria repository of jani.  When jani 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@stripped, 2008-06-02 13:49:39+03:00, jani@stripped +1 -0
  A fix for adding tests that need slave being started.
  Now including a master-slave.inc in test, or subsequent include
  files is enough. Before the fix one had to hardcode the test
  name in the source file.

  mysql-test/lib/mtr_cases.pl@stripped, 2008-06-02 13:49:38+03:00, jani@stripped +7 -0
    A fix for adding tests that need slave being started.
    Now including a master-slave.inc in test, or subsequent include
    files is enough. Before the fix one had to hardcode the test
    name in the source file.

diff -Nrup a/mysql-test/lib/mtr_cases.pl b/mysql-test/lib/mtr_cases.pl
--- a/mysql-test/lib/mtr_cases.pl	2008-04-28 16:46:33 +03:00
+++ b/mysql-test/lib/mtr_cases.pl	2008-06-02 13:49:38 +03:00
@@ -762,6 +762,12 @@ sub collect_one_test_case($$$$$$$$$) {
   {
     mtr_options_from_test_file($tinfo,"$testdir/${tname}.test");
 
+    if ( defined $tinfo->{'require_slave'} &&
+       (!defined $tinfo->{'slave_num'} || $tinfo->{'slave_num'} == 0))
+    {
+      $tinfo->{'slave_num'}= 1;
+    }
+
     if ( defined $::used_default_engine )
     {
       # Different default engine is used
@@ -891,6 +897,7 @@ our @tags=
  ["include/have_ndb_extra.inc", "ndb_extra", 1],
  ["include/ndb_master-slave.inc", "ndb_test", 1],
  ["require_manager", "require_manager", 1],
+ ["include/master-slave.inc", "require_slave", 1]
 );
 
 sub mtr_options_from_test_file($$) {