← 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-09-05 22:55:50 UTC
  • mfrom: (373.1.9 stl-client-progs)
  • Revision ID: monty@inaugust.com-20080905225550-zco374c9s7kxwqyb
Merged removal of DYNAMIC_STRING.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test-run.pl
135
135
our $exe_drizzled;
136
136
our $exe_drizzlecheck;
137
137
our $exe_drizzledump;
138
 
our $exe_mysqlslap;
 
138
our $exe_drizzleslap;
139
139
our $exe_drizzleimport;
140
140
our $exe_drizzle_fix_system_tables;
141
141
our $exe_drizzletest;
1251
1251
  if (!$opt_extern)
1252
1252
  {
1253
1253
# Look for SQL scripts directory
1254
 
    if ( $mysql_version_id >= 50100 )
1255
 
    {
1256
 
      $exe_mysqlslap= mtr_exe_exists("$path_client_bindir/mysqlslap");
1257
 
    }
 
1254
     if ( $mysql_version_id >= 50100 )
 
1255
     {
 
1256
         $exe_drizzleslap= mtr_exe_exists("$path_client_bindir/drizzleslap");
 
1257
     }
1258
1258
  }
1259
1259
 
1260
1260
# Look for drizzletest executable
1461
1461
  $ENV{'DRIZZLE_DUMP'}= $cmdline_mysqldump;
1462
1462
  $ENV{'DRIZZLE_DUMP_SLAVE'}= $cmdline_mysqldumpslave;
1463
1463
 
1464
 
 
1465
1464
  # ----------------------------------------------------
1466
1465
  # Setup env so childs can execute mysqlslap
1467
1466
  # ----------------------------------------------------
1468
 
  if ( $exe_mysqlslap )
 
1467
  if ( $exe_drizzleslap )
1469
1468
  {
1470
 
    my $cmdline_mysqlslap=
1471
 
      mtr_native_path($exe_mysqlslap) .
 
1469
    my $cmdline_drizzleslap=
 
1470
      mtr_native_path($exe_drizzleslap) .
1472
1471
      " -uroot " .
1473
1472
      "--port=$master->[0]->{'port'} ";
1474
1473
 
1475
1474
    if ( $opt_debug )
1476
1475
   {
1477
 
      $cmdline_mysqlslap .=
1478
 
        " --debug=d:t:A,$path_vardir_trace/log/mysqlslap.trace";
 
1476
      $cmdline_drizzleslap .=
 
1477
        " --debug=d:t:A,$path_vardir_trace/log/drizzleslap.trace";
1479
1478
    }
1480
 
    $ENV{'DRIZZLE_SLAP'}= $cmdline_mysqlslap;
 
1479
    $ENV{'DRIZZLE_SLAP'}= $cmdline_drizzleslap;
1481
1480
  }
1482
1481
 
 
1482
 
 
1483
 
1483
1484
  # ----------------------------------------------------
1484
1485
  # Setup env so childs can execute mysqlimport
1485
1486
  # ----------------------------------------------------