← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to tests/test-run.pl

  • Committer: Eric Day
  • Date: 2009-11-10 21:50:22 UTC
  • mto: This revision was merged to the branch mainline in revision 1218.
  • Revision ID: eday@oddments.org-20091110215022-0b2nqmurv7b2l6wo
Duplicated oldlibdrizzle module, one for Drizzle protocol and one for MySQL, per Brian's request from merge proposal. Port options are now --drizzle-protocol-port and --mysql-protocol-port.

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--oldlibdrizzle-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--oldlibdrizzle-mysql-port=%d", $prefix,
 
2455
  mtr_add_arg($args, "%s--mysql-protocol-port=%d", $prefix,
2456
2456
                $mysqld->{'port'} + 50);
2457
2457
 
2458
2458
  mtr_add_arg($args, "%s--datadir=%s", $prefix,