bk commit into 5.1 tree (msvensson:1.2339)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson 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, 2006-09-22 20:58:16+02:00, msvensson@shellback.(none) +2 -0
  Immediately skip tests that need innodb if mysqld does not support it

  mysql-test/lib/mtr_cases.pl@stripped, 2006-09-22 20:58:10+02:00, msvensson@shellback.(none)
+7 -0
    immediately skip tests that need innodb if mysqld does not support it

  mysql-test/mysql-test-run.pl@stripped, 2006-09-22 20:58:10+02:00,
msvensson@shellback.(none) +22 -0
    Check if innodb is supported

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	shellback.(none)
# Root:	/home/msvensson/mysql/work/my51-work

--- 1.34/mysql-test/lib/mtr_cases.pl	2006-09-22 20:58:22 +02:00
+++ 1.35/mysql-test/lib/mtr_cases.pl	2006-09-22 20:58:22 +02:00
@@ -503,6 +503,13 @@
       $tinfo->{'skip'}= 1;
       $tinfo->{'comment'}= "Test need debug binaries";
     }
+
+    if ( $tinfo->{'innodb_test'} && ! $::glob_innodb_supported )
+    {
+      $tinfo->{'skip'}= 1;
+      $tinfo->{'comment'}= "Test need innodb";
+    }
+
   }
 
   # We can't restart a running server that may be in use

--- 1.172/mysql-test/mysql-test-run.pl	2006-09-22 20:58:22 +02:00
+++ 1.173/mysql-test/mysql-test-run.pl	2006-09-22 20:58:22 +02:00
@@ -333,6 +333,7 @@
 our $used_binlog_format;
 our $debug_compiled_binaries;
 our $glob_tot_real_time= 0;
+our $glob_innodb_supported;
 
 ######################################################################
 #
@@ -351,6 +352,7 @@
 sub check_ssl_support ();
 sub check_running_as_root();
 sub check_ndbcluster_support ();
+sub check_innodb_support ();
 sub rm_ndbcluster_tables ($);
 sub ndbcluster_start_install ($);
 sub ndbcluster_start ($$);
@@ -391,6 +393,7 @@
   executable_setup();
 
   check_ndbcluster_support();
+  check_innodb_support();
   check_ssl_support();
   check_debug_support();
 
@@ -1830,6 +1833,25 @@
   }
   mtr_report("Binaries are debug compiled");
   $debug_compiled_binaries= 1;
+}
+
+sub check_innodb_support () {
+
+  # check innodb support by testing using a switch
+  # that is only available in that case
+  if ( mtr_run($exe_mysqld,
+	       ["--no-defaults",
+	        "--innodb-data-file-path",
+	        "--help"],
+	       "", "/dev/null", "/dev/null", "") != 0 )
+  {
+    # mtr_report("Binaries does not support innodb");
+    $glob_innodb_supported= 0;
+
+    return;
+  }
+  mtr_report("Using innodb when necessary");
+  $glob_innodb_supported= 1;
 }
 
 ##############################################################################