From 76d47f53d4970900e77f85ef2cd1c9cd7ca8502b Mon Sep 17 00:00:00 2001
From: unknown <knielsen@knielsen-hq.org>
Date: Mon, 5 Oct 2009 14:26:57 +0200
Subject: [PATCH] MBug#443014: Too many 'skipped' messages in mysql-test-run

Remove mysql-test-run.pl unnecessary and confusing 'skipped' messages.

 - In mysql-test-run.pl, we auto-generate combinations of replication
   tests. But this sometimes generates combinations that are meaningless,
   like running a test that requires row-based replication with
   statement-based. These superfluous combinationes should not be
   reported as skipped, they should just be deleted.

 - Remove ndb suites from default suites, as we do not support NDB
   in MariaDB.

Keep skip messages resulting from running mysql-test-run.pl in special
ways, eg. --mysqld=--binlog-format=statement.
---
 mysql-test/lib/mtr_cases.pm  | 12 ++++++++++++
 mysql-test/mysql-test-run.pl |  4 ++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm
index d2b454014c4..3c62388a310 100644
--- a/mysql-test/lib/mtr_cases.pm
+++ b/mysql-test/lib/mtr_cases.pm
@@ -560,8 +560,12 @@ sub collect_one_suite($)
 sub optimize_cases {
   my ($cases)= @_;
 
+  my @new_cases= ();
+
   foreach my $tinfo ( @$cases )
   {
+    push @new_cases, $tinfo;
+
     # Skip processing if already marked as skipped
     next if $tinfo->{skip};
 
@@ -615,6 +619,13 @@ sub optimize_cases {
 	  $tinfo->{'skip'}= 1;
 	  $tinfo->{'comment'}=
 	    "Doesn't support --binlog-format='$test_binlog_format'";
+          # This test was added as a replication combination, but it is not
+          # actually ever possible to run it, as it is not made for this
+          # combination.
+          # So delete it from the list, rather than confuse the user with a
+          # message that this test is skipped (it is not really, just run
+          # with other combinations).
+          pop(@new_cases);
 	  next;
 	}
       }
@@ -683,6 +694,7 @@ sub optimize_cases {
       }
     }
   }
+  @$cases= @new_cases;
 }
 
 
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index d80ea16e6a3..4581610e321 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -126,13 +126,13 @@ my $path_config_file;           # The generated config file, var/my.cnf
 # executables will be used by the test suite.
 our $opt_vs_config = $ENV{'MTR_VS_CONFIG'};
 
-my $DEFAULT_SUITES= "binlog,federated,main,maria,ndb,rpl,rpl_ndb,innodb";
+my $DEFAULT_SUITES= "binlog,federated,main,maria,rpl,innodb";
 my $opt_suites;
 
 our $opt_usage;
 our $opt_list_options;
 our $opt_suites;
-our $opt_suites_default= "main,backup,backup_engines,binlog,rpl,rpl_ndb,ndb"; # Default suites to run
+our $opt_suites_default= "main,backup,backup_engines,binlog,rpl"; # Default suites to run
 our $opt_script_debug= 0;  # Script debugging, enable with --script-debug
 our $opt_verbose= 0;  # Verbose output, enable with --verbose
 our $exe_mysql;