bk commit into 5.1 tree (msvensson:1.2563)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson.  When msvensson 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-03-10 16:40:19+01:00, msvensson@stripped +1 -0
  Mark test that includes "ndb_master-slave.inc" as ndb_test

  mysql-test/lib/mtr_cases.pm@stripped, 2008-03-10 16:40:15+01:00, msvensson@stripped
+2 -1
    Mark test that includes "ndb_master-slave.inc" as ndb_test

diff -Nrup a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm
--- a/mysql-test/lib/mtr_cases.pm	2008-02-28 12:02:24 +01:00
+++ b/mysql-test/lib/mtr_cases.pm	2008-03-10 16:40:15 +01:00
@@ -820,7 +820,7 @@ sub collect_one_test_case {
   if ( $tinfo->{'ndb_test'} )
   {
     # This is a NDB test
-    if ( ! $::glob_ndbcluster_supported )
+    if ( $::opt_skip_ndbcluster == 2 )
     {
       # Ndb is not supported, skip it
       $tinfo->{'skip'}= 1;
@@ -969,6 +969,7 @@ my @tags=
  ["include/have_ndb_extra.inc", "ndb_extra", 1],
  ["include/master-slave.inc", "rpl_test", 1],
  ["include/ndb_master-slave.inc", "rpl_test", 1],
+ ["include/ndb_master-slave.inc", "ndb_test", 1],
  ["include/federated.inc", "federated_test", 1],
  ["include/not_embedded.inc", "not_embedded", 1],
 );