bk commit into maria tree (guilhem:1.2604)

[Guilhem Bichot]

Below is the list of changes that have just been committed into a local
maria repository of guilhem.  When guilhem 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-02-20 21:37:03+01:00, guilhem@stripped +1 -0
  non-debug build should not cause ma_test_all-t to always fail:
  make ma_test_recovery.pl return 0 if it skips itself.

  storage/maria/unittest/ma_test_recovery.pl@stripped, 2008-02-20 21:37:01+01:00,
guilhem@stripped +5 -1
    non-debug build should not cause ma_test_all-t to always fail

diff -Nrup a/storage/maria/unittest/ma_test_recovery.pl
b/storage/maria/unittest/ma_test_recovery.pl
--- a/storage/maria/unittest/ma_test_recovery.pl	2008-02-20 17:42:10 +01:00
+++ b/storage/maria/unittest/ma_test_recovery.pl	2008-02-20 21:37:01 +01:00
@@ -72,7 +72,11 @@ sub main
   {
     print "Recovery tests require compilation with DBUG\n";
     print "Aborting test\n";
-    exit(1);
+    # In the future, we will not abort but use maria_chk --zerofill-keep-lsn
+    # for comparisons in non-debug builds.
+    # For now we just skip the test, pretending it passed (nothing is
+    # alarming).
+    exit(0);
   }
 
   # To not flood the screen, we redirect all the commands below to a text file