← Back to branch summary

~mdcallag/+junk/5.1-map

« back to all changes in this revision

Viewing changes to mysql-test/lib/mtr_cases.pl

  • Committer: msvensson at pilot
  • Date: 2007-04-24 09:11:45 UTC
  • mfrom: (2469.1.106)
  • Revision ID: sp1r-msvensson@pilot.blaudden-20070424091145-10463
Merge pilot.blaudden:/home/msvensson/mysql/my51-m-mysql_upgrade
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysql-test/lib/mtr_cases.pl
354
354
        next;
355
355
      }
356
356
 
 
357
      $value= mtr_match_prefix($opt, "--slave-num=");
 
358
      if ( defined $value )
 
359
      {
 
360
        $tinfo->{'slave_num'}= $value;
 
361
        next;
 
362
      }
 
363
 
357
364
      $value= mtr_match_prefix($opt, "--result-file=");
358
365
      if ( defined $value )
359
366
      {
498
505
  {
499
506
    mtr_options_from_test_file($tinfo,"$testdir/${tname}.test");
500
507
 
 
508
    if ( defined $::used_default_engine )
 
509
    {
 
510
      # Different default engine is used
 
511
      # tag test to require that engine
 
512
      $tinfo->{'ndb_test'}= 1
 
513
        if ( $::used_default_engine =~ /^ndb/i );
 
514
 
 
515
      $tinfo->{'innodb_test'}= 1
 
516
        if ( $::used_default_engine =~ /^innodb/i );
 
517
    }
 
518
 
501
519
    if ( $tinfo->{'big_test'} and ! $::opt_big_test )
502
520
    {
503
521
      $tinfo->{'skip'}= 1;
523
541
         ! ( $tinfo->{'binlog_format'} eq $::used_binlog_format ) )
524
542
    {
525
543
      $tinfo->{'skip'}= 1;
526
 
      $tinfo->{'comment'}= "Not running with binlog format '$tinfo->{'binlog_format'}'";
 
544
      $tinfo->{'comment'}= "Requiring binlog format '$tinfo->{'binlog_format'}'";
527
545
      return;
528
546
    }
529
547
 
588
606
(
589
607
 ["include/have_innodb.inc", "innodb_test", 1],
590
608
 ["include/have_binlog_format_row.inc", "binlog_format", "row"],
591
 
 ["include/have_binlog_format_statement.inc", "binlog_format", "stmt"],
 
609
 ["include/have_binlog_format_statement.inc", "binlog_format", "statement"],
592
610
 ["include/have_binlog_format_mixed.inc", "binlog_format", "mixed"],
593
611
 ["include/big_test.inc", "big_test", 1],
594
612
 ["include/have_debug.inc", "need_debug", 1],