Commit ee806f98 authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.1-maint 

into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint


mysql-test/mysql-test-run.pl:
  Auto merged
parents d026ddba 2c40e8ba

mysql-test/lib/mtr_cases.pl

+7 −0
Original line number Diff line number Diff line
@@ -514,6 +514,13 @@ sub collect_one_test_case($$$$$$$) { 
      $tinfo->{'comment'}= "Test need debug binaries";

      return;

    }



    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

mysql-test/mysql-test-run.pl

+22 −0
Original line number Diff line number Diff line
@@ -332,6 +332,7 @@ our @data_dir_lst; 
our $used_binlog_format;

our $debug_compiled_binaries;

our $glob_tot_real_time= 0;

our $glob_innodb_supported;



######################################################################

#
@@ -350,6 +351,7 @@ sub cleanup_stale_files (); 
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 ($$);
@@ -390,6 +392,7 @@ sub main () { 
  executable_setup();



  check_ndbcluster_support();

  check_innodb_support();

  check_ssl_support();

  check_debug_support();
@@ -1855,6 +1858,25 @@ sub check_debug_support () { 
  $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;

}



##############################################################################

#

#  Start the ndb cluster