← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to tests/test-run.pl

  • Committer: Monty Taylor
  • Date: 2008-10-02 18:09:31 UTC
  • Revision ID: monty@inaugust.com-20081002180931-t9oosmm6uvps27k0
Removed getpass references.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test-run.pl
127
127
our $exe_master_mysqld;
128
128
our $exe_drizzle;
129
129
our $exe_drizzleadmin;
 
130
our $exe_drizzlebinlog;
130
131
our $exe_drizzle_client_test;
131
132
our $exe_bug25714;
132
133
our $exe_drizzled;
1232
1233
  $exe_drizzlecheck= mtr_exe_exists("$path_client_bindir/drizzlecheck");
1233
1234
  $exe_drizzledump= mtr_exe_exists("$path_client_bindir/drizzledump");
1234
1235
  $exe_drizzleimport= mtr_exe_exists("$path_client_bindir/drizzleimport");
 
1236
  $exe_drizzlebinlog= mtr_exe_exists("$path_client_bindir/drizzlebinlog");
1235
1237
  $exe_drizzleadmin= mtr_exe_exists("$path_client_bindir/drizzleadmin");
1236
1238
  $exe_drizzle=          mtr_exe_exists("$path_client_bindir/drizzle");
1237
1239
 
1485
1487
 
1486
1488
 
1487
1489
  # ----------------------------------------------------
 
1490
  # Setup env so childs can execute mysqlbinlog
 
1491
  # ----------------------------------------------------
 
1492
  my $cmdline_mysqlbinlog=
 
1493
    mtr_native_path($exe_drizzlebinlog) .
 
1494
      " --no-defaults --disable-force-if-open --debug-check";
 
1495
 
 
1496
  if ( $opt_debug )
 
1497
  {
 
1498
    $cmdline_mysqlbinlog .=
 
1499
      " --debug=d:t:A,$path_vardir_trace/log/mysqlbinlog.trace";
 
1500
  }
 
1501
  $ENV{'DRIZZLE_BINLOG'}= $cmdline_mysqlbinlog;
 
1502
 
 
1503
  # ----------------------------------------------------
1488
1504
  # Setup env so childs can execute mysql
1489
1505
  # ----------------------------------------------------
1490
1506
  my $cmdline_mysql=
2466
2482
    mtr_add_arg($args, "%s--secure-file-priv=%s", $prefix, $opt_vardir);
2467
2483
  }
2468
2484
 
 
2485
  if ( $mysql_version_id >= 50000 )
 
2486
  {
 
2487
    mtr_add_arg($args, "%s--log-bin-trust-function-creators", $prefix);
 
2488
  }
 
2489
 
2469
2490
  mtr_add_arg($args, "%s--tmpdir=$opt_tmpdir", $prefix);
2470
2491
 
2471
2492
  # Increase default connect_timeout to avoid intermittent
2492
2513
 
2493
2514
  my $log_base_path= "$opt_vardir/log/$mysqld->{'type'}$sidx";
2494
2515
  mtr_add_arg($args, "%s--log=%s.log", $prefix, $log_base_path);
 
2516
  mtr_add_arg($args,
 
2517
              "%s--log-slow-queries=%s-slow.log", $prefix, $log_base_path);
2495
2518
 
2496
2519
  # Check if "extra_opt" contains --skip-log-bin
2497
2520
  my $skip_binlog= grep(/^--skip-log-bin/, @$extra_opt, @opt_extra_mysqld_opt);