bzr commit into mysql-6.0-maria branch (guilhem:2688)

[Guilhem Bichot]

#At file:///home/mysql_src/bzrrepos/mysql-6.0-maria2/

 2688 Guilhem Bichot	2008-06-27
      Fix for test failures when Maria is not compiled in.
modified:
  mysql-test/mysql-test-run.pl
  mysql-test/t/maria-recover-master.opt
  mysql-test/t/maria-recovery-master.opt

per-file messages:
  mysql-test/mysql-test-run.pl
    Maria was be disabled so executables not available
  mysql-test/t/maria-recover-master.opt
    Maria may be disabled
  mysql-test/t/maria-recovery-master.opt
    Maria may be disabled
=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2008-06-26 18:21:15 +0000
+++ b/mysql-test/mysql-test-run.pl	2008-06-27 09:39:14 +0000
@@ -2079,13 +2079,13 @@ sub environment_setup () {
   # ----------------------------------------------------
   # Setup env so childs can execute maria_pack and maria_chk
   # ----------------------------------------------------
-  $ENV{'MARIA_CHK'}= mtr_native_path(mtr_exe_exists(
+  $ENV{'MARIA_CHK'}= mtr_native_path(mtr_exe_maybe_exists(
                        vs_config_dirs('storage/maria', 'maria_chk'),
                        vs_config_dirs('maria', 'maria_chk'),
                        "$path_client_bindir/maria_chk",
                        "$glob_basedir/storage/maria/maria_chk",
                        "$glob_basedir/maria/maria_chk"));
-  $ENV{'MARIA_PACK'}= mtr_native_path(mtr_exe_exists(
+  $ENV{'MARIA_PACK'}= mtr_native_path(mtr_exe_maybe_exists(
                         vs_config_dirs('storage/maria', 'maria_pack'),
                         vs_config_dirs('maria', 'maria_pack'),
                         "$path_client_bindir/maria_pack",

=== modified file 'mysql-test/t/maria-recover-master.opt'
--- a/mysql-test/t/maria-recover-master.opt	2008-06-02 20:53:25 +0000
+++ b/mysql-test/t/maria-recover-master.opt	2008-06-27 09:39:14 +0000
@@ -1 +1 @@
---maria-recover=backup --maria-log-dir-path=../tmp
+--loose-maria-recover=backup --loose-maria-log-dir-path=../tmp

=== modified file 'mysql-test/t/maria-recovery-master.opt'
--- a/mysql-test/t/maria-recovery-master.opt	2008-02-06 16:55:04 +0000
+++ b/mysql-test/t/maria-recovery-master.opt	2008-06-27 09:39:14 +0000
@@ -1 +1 @@
---skip-stack-trace --skip-core-file --maria-log-dir-path=../tmp
+--skip-stack-trace --skip-core-file --loose-maria-log-dir-path=../tmp