← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to tests/test-run.pl

  • Committer: Brian Aker
  • Date: 2009-11-13 18:25:26 UTC
  • mfrom: (971.7.11 eday-dev)
  • Revision ID: brian@gaz-20091113182526-evaib6rmmndruddq
Merge Eric

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test-run.pl
2436
2436
  # Increase default connect_timeout to avoid intermittent
2437
2437
  # disconnects when test servers are put under load
2438
2438
  # see BUG#28359
2439
 
  mtr_add_arg($args, "%s--oldlibdrizzle-connect-timeout=60", $prefix);
 
2439
  mtr_add_arg($args, "%s--drizzle-protocol-connect-timeout=60", $prefix);
2440
2440
 
2441
2441
 
2442
2442
  # When mysqld is run by a root user(euid is 0), it will fail
2449
2449
  mtr_add_arg($args, "%s--pid-file=%s", $prefix,
2450
2450
              $mysqld->{'path_pid'});
2451
2451
 
2452
 
  mtr_add_arg($args, "%s--port=%d", $prefix,
 
2452
  mtr_add_arg($args, "%s--drizzle-protocol-port=%d", $prefix,
2453
2453
                $mysqld->{'port'});
2454
2454
 
 
2455
  mtr_add_arg($args, "%s--mysql-protocol-port=%d", $prefix,
 
2456
                $mysqld->{'port'} + 50);
 
2457
 
2455
2458
  mtr_add_arg($args, "%s--datadir=%s", $prefix,
2456
2459
              $mysqld->{'path_myddir'});
2457
2460