Commit 4ce41024 authored by unknown's avatar unknown
Browse files

Merge booka.opbmk:/home/alik/Documents/MySQL/devel/5.0-rt-im 

into  booka.opbmk:/home/alik/Documents/MySQL/devel/5.1-rt-im


mysql-test/mysql-test-run.pl:
  Auto merged
server-tools/instance-manager/instance_options.cc:
  Manual merge
server-tools/instance-manager/mysqlmanager.cc:
  Manual merge.
parents 4acc8e9d 8251e016

mysql-test/t/kill_n_check.sh

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ pid_path="$1" 
expected_result="$2"

total_timeout="$3"

test_id="$4"

log_file="$MYSQLTEST_VARDIR/log/$test_id.log"

log_file="$MYSQLTEST_VARDIR/log/$test_id.script.log"



log_debug "-- $basename: starting --"

log_debug "pid_path: '$pid_path'"

mysql-test/t/log.sh

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ if [ $# -lt 2 ]; then 
fi



test_id="$1"

log_file="$MYSQLTEST_VARDIR/log/$test_id.log"

log_file="$MYSQLTEST_VARDIR/log/$test_id.script.log"



shift

mysql-test/t/wait_for_process.sh

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ pid_path="$1" 
total_attempts="$2"

event="$3"

test_id="$4"

log_file="$MYSQLTEST_VARDIR/log/$test_id.log"

log_file="$MYSQLTEST_VARDIR/log/$test_id.script.log"



log_debug "-- $basename: starting --"

log_debug "pid_path: '$pid_path'"

mysql-test/t/wait_for_socket.sh

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ password="$4" 
db="$5"

total_timeout="$6"

test_id="$7"

log_file="$MYSQLTEST_VARDIR/log/$test_id.log"

log_file="$MYSQLTEST_VARDIR/log/$test_id.script.log"



log_debug "-- $basename: starting --"

log_debug "client_exe: '$client_exe'"