← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to tests/test-run.pl

  • Committer: Lee Bieber
  • Date: 2010-11-07 22:53:13 UTC
  • mfrom: (1909.4.6 pbms-tests)
  • mto: This revision was merged to the branch mainline in revision 1912.
  • Revision ID: kalebral@gmail.com-20101107225313-26nhv0btydq2sh74
Merge Stewart - Fix bug 616466: auto_increment and PBMS problem - adds test case for this, can no longer reproduce the problem

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test-run.pl
212
212
our $opt_master_myport;
213
213
our $opt_slave_myport;
214
214
our $opt_memc_myport;
 
215
our $opt_pbms_myport;
215
216
our $opt_record;
216
217
my $opt_report_features;
217
218
our $opt_check_testcases;
489
490
             'master_port=i'            => \$opt_master_myport,
490
491
             'slave_port=i'             => \$opt_slave_myport,
491
492
             'memc_port=i'              => \$opt_memc_myport,
 
493
             'pbms_port=i'              => \$opt_pbms_myport,
492
494
             'dtr-build-thread=i'       => \$opt_dtr_build_thread,
493
495
 
494
496
             # Test case authoring
1132
1134
 
1133
1135
  $opt_slave_myport=          gimme_a_good_port($opt_master_myport + 2);  # and 3 4
1134
1136
  $opt_memc_myport= gimme_a_good_port($opt_master_myport + 10);
 
1137
  $opt_pbms_myport= gimme_a_good_port($opt_master_myport + 11);
1135
1138
 
1136
1139
  if ( $opt_master_myport < 5001 or $opt_master_myport + 10 >= 32767 )
1137
1140
  {
1454
1457
  $ENV{'SLAVE_MYPORT1'}=      $slave->[1]->{'port'};
1455
1458
  $ENV{'SLAVE_MYPORT2'}=      $slave->[2]->{'port'};
1456
1459
  $ENV{'MC_PORT'}=            $opt_memc_myport;
 
1460
  $ENV{'PBMS_PORT'}=            $opt_pbms_myport;
1457
1461
  $ENV{'DRIZZLE_TCP_PORT'}=     $drizzled_variables{'drizzle-protocol.port'};
1458
1462
 
1459
1463
  $ENV{'DTR_BUILD_THREAD'}=      $opt_dtr_build_thread;
1609
1613
    print "Using SLAVE_MYPORT1         = $ENV{SLAVE_MYPORT1}\n";
1610
1614
    print "Using SLAVE_MYPORT2         = $ENV{SLAVE_MYPORT2}\n";
1611
1615
    print "Using MC_PORT               = $ENV{MC_PORT}\n";
 
1616
    print "Using PBMS_PORT             = $ENV{PBMS_PORT}\n";
1612
1617
  }
1613
1618
 
1614
1619
  # Create an environment variable to make it possible