← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to tests/test-run.pl

  • Committer: Paul McCullagh
  • Date: 2008-10-09 19:44:43 UTC
  • mto: (499.1.1 codestyle)
  • mto: This revision was merged to the branch mainline in revision 505.
  • Revision ID: paul.mccullagh@primebase.org-20081009194443-o6n7jr6ucm2c4apj
Added --engine option to drizzle-test-run (default innodb)

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test-run.pl
157
157
our $opt_debug;
158
158
our $opt_do_test;
159
159
our @opt_cases;                  # The test cases names in argv
 
160
our $opt_engine;
160
161
 
161
162
our $opt_extern= 0;
162
163
our $opt_socket;
485
486
 
486
487
             # Extra options used when starting mysqld
487
488
             'mysqld=s'                 => \@opt_extra_mysqld_opt,
 
489
             'engine=s'                 => \$opt_engine,
488
490
 
489
491
             # Run test on running server
490
492
             'extern'                   => \$opt_extern,
649
651
    $mysqld_variables{'port'}= 4427;
650
652
  }
651
653
 
 
654
  if (!$opt_engine)
 
655
  {
 
656
    $opt_engine= "pbxt";
 
657
  }
 
658
 
652
659
  if ( $opt_comment )
653
660
  {
654
661
    print "\n";
2460
2467
 
2461
2468
  mtr_add_arg($args, "%s--basedir=%s", $prefix, $path_my_basedir);
2462
2469
 
 
2470
  if ($opt_engine)
 
2471
  {
 
2472
    mtr_add_arg($args, "%s--default-storage-engine=%s", $prefix, $opt_engine);
 
2473
  }
 
2474
 
2463
2475
  if ( $mysql_version_id >= 50036)
2464
2476
  {
2465
2477
    # By default, prevent the started mysqld to access files outside of vardir