← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to tests/test-run.pl

Merged trunk and use-std-unordred.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test-run.pl
1458
1458
  $ENV{'SLAVE_MYPORT1'}=      $slave->[1]->{'port'};
1459
1459
  $ENV{'SLAVE_MYPORT2'}=      $slave->[2]->{'port'};
1460
1460
  $ENV{'MC_PORT'}=            $opt_memc_myport;
1461
 
  $ENV{'DRIZZLE_TCP_PORT'}=     $mysqld_variables{'port'};
 
1461
  $ENV{'DRIZZLE_TCP_PORT'}=     $mysqld_variables{'drizzle-protocol-port'};
1462
1462
 
1463
1463
  $ENV{'MTR_BUILD_THREAD'}=      $opt_mtr_build_thread;
1464
1464
 
3281
3281
  {
3282
3282
    # write init file for drizzled
3283
3283
    mtr_tofile($dbx_init_file,
3284
 
               "stop in drizzled::mysql_parse\n" .
 
3284
               "stop in __1cIdrizzledLmysql_parse6Fpn0AHSession_pkcI_v_\n" .
3285
3285
               "runargs $str\n" .
3286
3286
               "run\n" .
3287
3287
               "\n");