bzr commit into nuts branch (Serge.Kozlov:390)

[Serge Kozlov]

#At file:///home/ksm/oracle/QA/nuts/ based on revid:serge.kozlov@stripped

  390 Serge Kozlov	2011-01-31
      rep_func::crash_safe_master
      do not compare databases for MyISAM storage engine

    modified:
      suites/rep_func/crash_safe_master.pm
=== modified file 'suites/rep_func/crash_safe_master.pm'
--- a/suites/rep_func/crash_safe_master.pm	2011-01-30 21:09:31 +0000
+++ b/suites/rep_func/crash_safe_master.pm	2011-01-31 20:00:16 +0000
@@ -79,6 +79,7 @@ sub fire
     
     # Set number of subtests
     my $subtests = 17;
+    $subtests-- if ($engine =~ m/(myisam|memory)/i);
     
     # Skip test if servers compiled withot debug support
     SKIP: 
@@ -149,8 +150,10 @@ sub fire
     		ok_sql ( $master, "SET SESSION DEBUG='d,$crash_point'");
 	    }
 	    # Remove transaction for MyISAM engine
-	    next if ($query =~ m/^(begin|commit|rollback)/i && $engine =~ m/myisam/i);
-	    sql ( $master, $query );
+	    if (!($query =~ m/^(begin|commit|rollback)/i && $engine =~ m/(myisam|memory)/i))
+	    {
+		sql ( $master, $query );
+	    }
 	    $query_num++;
 	}
 
@@ -181,8 +184,11 @@ sub fire
 	# Sync slave with master
 	ok_synchronize($master, $slave);
 
-	# Compare databases
-	ok_diff_databases($master, "test", $slave, "test");
+	# Compare databases only for transaction tables
+	if ($engine =~ m/innodb/i)
+	{
+	    ok_diff_databases($master, "test", $slave, "test");
+	}
     }
 }
 


Attachment: [text/bzr-bundle] bzr/[e-mail]