From 379809f40efff336dfa7c539c3e3c3407e823740 Mon Sep 17 00:00:00 2001
From: unknown <msvensson@neptunus.(none)>
Date: Wed, 25 Oct 2006 12:40:33 +0200
Subject: [PATCH] Set flag opt_skip_ndbcluster_slave if no slaves are being
 used. Add comments Deperlify

---
 mysql-test/mysql-test-run.pl | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 9fc63e0462b..3549c13a2a5 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -405,9 +405,25 @@ sub main () {
       }
       $use_innodb||= $test->{'innodb_test'};
     }
-    $opt_skip_ndbcluster= $opt_skip_ndbcluster_slave= 1
-      unless $need_ndbcluster;
-    $opt_skip_im= 1 unless $need_im;
+
+    # Check if cluster can be skipped
+    if ( !$need_ndbcluster )
+    {
+      $opt_skip_ndbcluster= 1;
+      $opt_skip_ndbcluster_slave= 1;
+    }
+
+    # Check if slave cluster can be skipped
+    if ($max_slave_num == 0)
+    {
+      $opt_skip_ndbcluster_slave= 1;
+    }
+
+    # Check if im can be skipped
+    if ( ! $need_im )
+    {
+     $opt_skip_im= 1;
+   }
 
     initialize_servers();