Commit e4f48274 authored by unknown's avatar unknown
Browse files

Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Merge 5.0->5.1
parents ab773fcf 8b873c3f

mysql-test/lib/mtr_cases.pl

+11 −0
Original line number Diff line number Diff line
@@ -498,6 +498,17 @@ sub collect_one_test_case($$$$$$$) { 
  {

    mtr_options_from_test_file($tinfo,"$testdir/${tname}.test");



    if ( defined $::used_default_engine )

    {

      # Different default engine is used

      # tag test to require that engine

      $tinfo->{'ndb_test'}= 1

	if ( $::used_default_engine =~ /^ndb/i );



      $tinfo->{'innodb_test'}= 1

	if ( $::used_default_engine =~ /^innodb/i );

    }



    if ( $tinfo->{'big_test'} and ! $::opt_big_test )

    {

      $tinfo->{'skip'}= 1;

mysql-test/mysql-test-run.pl

+23 −6
Original line number Diff line number Diff line
@@ -305,6 +305,7 @@ our $path_sql_dir; 
our @data_dir_lst;



our $used_binlog_format;

our $used_default_engine;

our $debug_compiled_binaries;

our $glob_tot_real_time= 0;
@@ -520,7 +521,7 @@ sub command_line_setup () { 
             'compress'                 => \$opt_compress,

             'bench'                    => \$opt_bench,

             'small-bench'              => \$opt_small_bench,

             'with-ndbcluster'          => \$opt_with_ndbcluster,

             'with-ndbcluster|ndb'      => \$opt_with_ndbcluster,

             'vs-config'            => \$opt_vs_config,



             # Control what test suites or cases to run
@@ -777,6 +778,26 @@ sub command_line_setup () { 
    mtr_report("Using binlog format '$used_binlog_format'");

  }





  # --------------------------------------------------------------------------

  # Find out default storage engine being used(if any)

  # --------------------------------------------------------------------------

  if ( $opt_with_ndbcluster )

  {

    # --ndb or --with-ndbcluster turns on --default-storage-engine=ndbcluster

    push(@opt_extra_mysqld_opt, "--default-storage-engine=ndbcluster");

  }



  foreach my $arg ( @opt_extra_mysqld_opt )

  {

    if ( $arg =~ /default-storage-engine=(\S+)/ )

    {

      $used_default_engine= $1;

    }

  }

  mtr_report("Using default engine '$used_default_engine'")

    if defined $used_default_engine;



  # --------------------------------------------------------------------------

  # Check if we should speed up tests by trying to run on tmpfs

  # --------------------------------------------------------------------------
@@ -902,10 +923,6 @@ sub command_line_setup () { 
  # --------------------------------------------------------------------------

  # Ndb cluster flags

  # --------------------------------------------------------------------------

  if ( $opt_with_ndbcluster and !$opt_bench)

  {

    mtr_error("Can only use --with-ndbcluster together with --bench");

  }



  if ( $opt_ndbconnectstring )

  {
@@ -5037,7 +5054,7 @@ Options to control what engine/variation to run 
  skip-ssl              Dont start server with support for ssl connections

  bench                 Run the benchmark suite

  small-bench           Run the benchmarks with --small-tests --small-tables

  with-ndbcluster       Use cluster as default table type for benchmark

  ndb|with-ndbcluster   Use cluster as default table type

  vs-config             Visual Studio configuration used to create executables

                        (default: MTR_VS_CONFIG environment variable)