← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to tests/test-run.pl

Merged build changes from Antony.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test-run.pl
592
592
              "as follows:\n./$glob_scriptname");
593
593
  }
594
594
 
595
 
  if ( -d "../server" )
 
595
  if ( -d "../drizzled" )
596
596
  {
597
597
    $source_dist=  1;
598
598
  }
638
638
 
639
639
  # Look for language files and charsetsdir, use same share
640
640
  $path_share=      mtr_path_exists("$glob_basedir/share/mysql",
641
 
                                    "$glob_basedir/server/share",
 
641
                                    "$glob_basedir/drizzled/share",
642
642
                                    "$glob_basedir/share");
643
643
 
644
644
  $path_language=      mtr_path_exists("$path_share/english");
647
647
 
648
648
  if (!$opt_extern)
649
649
  {
650
 
    $exe_drizzled=       mtr_exe_exists ("$glob_basedir/server/drizzled",
 
650
    $exe_drizzled=       mtr_exe_exists ("$glob_basedir/drizzled/drizzled",
651
651
                                       "$path_client_bindir/drizzled",
652
652
                                       "$glob_basedir/libexec/drizzled",
653
653
                                       "$glob_basedir/bin/drizzled",
2529
2529
  mtr_add_arg($args, "%s--datadir=%s", $prefix,
2530
2530
              $mysqld->{'path_myddir'});
2531
2531
 
2532
 
 
2533
 
  if ( $mysql_version_id >= 50106 )
2534
 
  {
2535
 
    # Turn on logging to bothe tables and file
2536
 
    mtr_add_arg($args, "%s--log-output=table,file", $prefix);
2537
 
  }
2538
 
 
2539
2532
  my $log_base_path= "$opt_vardir/log/$mysqld->{'type'}$sidx";
2540
2533
  mtr_add_arg($args, "%s--log=%s.log", $prefix, $log_base_path);
2541
2534
  mtr_add_arg($args,