← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to tests/test-run.pl

  • Committer: Andrew Hutchings
  • Date: 2011-06-07 21:19:19 UTC
  • mto: This revision was merged to the branch mainline in revision 2327.
  • Revision ID: andrew@linuxjedi.co.uk-20110607211919-7ef8spt1qkefxoyx
Remove all drizzleadmin code (hopefully)

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test-run.pl
156
156
 
157
157
our $exe_master_drizzled;
158
158
our $exe_drizzle;
159
 
our $exe_drizzleadmin;
160
159
our $exe_drizzle_client_test;
161
160
our $exe_bug25714;
162
161
our $exe_drizzled;
1300
1299
  $exe_drizzledump= dtr_exe_exists("$path_client_bindir/drizzledump");
1301
1300
  $exe_drizzleimport= dtr_exe_exists("$path_client_bindir/drizzleimport");
1302
1301
  $exe_drizzle=          dtr_exe_exists("$path_client_bindir/drizzle");
1303
 
  $exe_drizzleadmin= dtr_exe_exists("$path_client_bindir/drizzleadmin");
1304
1302
 
1305
1303
  if (!$opt_extern)
1306
1304
  {
1355
1353
    " -uroot --port=$drizzled->{'port'} ";
1356
1354
}
1357
1355
 
1358
 
sub generate_cmdline_drizzleadmin ($) {
1359
 
  my($drizzled) = @_;
1360
 
  return
1361
 
    dtr_native_path($exe_drizzleadmin) .
1362
 
    " -uroot --port=$drizzled->{'port'} ";
1363
 
}
1364
 
 
1365
1356
##############################################################################
1366
1357
#
1367
1358
#  Set environment to be used by childs of this process for
1517
1508
  # ----------------------------------------------------
1518
1509
  # Setup env to childs can execute myqldump
1519
1510
  # ----------------------------------------------------
1520
 
  my $cmdline_drizzleadmin= generate_cmdline_drizzleadmin($master->[0]);
1521
1511
  my $cmdline_drizzledump= generate_cmdline_drizzledump($master->[0]);
1522
1512
  my $cmdline_drizzledumpslave= generate_cmdline_drizzledump($slave->[0]);
1523
1513
  my $cmdline_drizzledump_secondary= dtr_native_path($exe_drizzledump) .
1533
1523
    $cmdline_drizzledump_secondary .=
1534
1524
      " --debug=d:t:A,$path_vardir_trace/log/drizzledump-drizzle.trace";
1535
1525
  }
1536
 
  $ENV{'DRIZZLE_ADMIN'}= $cmdline_drizzleadmin;
1537
1526
  $ENV{'DRIZZLE_DUMP'}= $cmdline_drizzledump;
1538
1527
  $ENV{'DRIZZLE_DUMP_SLAVE'}= $cmdline_drizzledumpslave;
1539
1528
  $ENV{'DRIZZLE_DUMP_SECONDARY'}= $cmdline_drizzledump_secondary;