Commit de5a4c09 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-build 

into mysql.com:/Users/kent/mysql/bk/mysql-5.0-build


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
parents 135979d9 27a711b4

mysql-test/mysql-test-run.pl

+3 −3
Original line number Diff line number Diff line
@@ -586,7 +586,7 @@ sub command_line_setup () { 
  $slave->[1]->{'path_mypid'}=    "$glob_mysql_test_dir/var/run/slave1.pid";

  $slave->[1]->{'path_mysock'}=   "$opt_tmpdir/slave1.sock";

  $slave->[1]->{'path_myport'}=    $opt_slave_myport + 1;

  $slave->[1]->{'start_timeout'}=  30;

  $slave->[1]->{'start_timeout'}=  300;



  $slave->[2]->{'path_myddir'}=   "$glob_mysql_test_dir/var/slave2-data";

  $slave->[2]->{'path_myerr'}=    "$glob_mysql_test_dir/var/log/slave2.err";
@@ -594,7 +594,7 @@ sub command_line_setup () { 
  $slave->[2]->{'path_mypid'}=    "$glob_mysql_test_dir/var/run/slave2.pid";

  $slave->[2]->{'path_mysock'}=   "$opt_tmpdir/slave2.sock";

  $slave->[2]->{'path_myport'}=    $opt_slave_myport + 2;

  $slave->[2]->{'start_timeout'}=  30;

  $slave->[2]->{'start_timeout'}=  300;



  # Do sanity checks of command line arguments

mysql-test/mysql-test-run.sh

+1 −1
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ SLEEP_TIME_FOR_DELETE=10 
SLEEP_TIME_FOR_FIRST_MASTER=400		# Enough time to create innodb tables

SLEEP_TIME_FOR_SECOND_MASTER=400

SLEEP_TIME_FOR_FIRST_SLAVE=400

SLEEP_TIME_FOR_SECOND_SLAVE=30

SLEEP_TIME_FOR_SECOND_SLAVE=300

CHARACTER_SET=latin1

DBUSER=""

START_WAIT_TIMEOUT=10