mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-29 18:20:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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.
This commit is contained in:
unknown 2007-02-24 13:31:01 +03:00
commit 4ce41024c1
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mysql-test/t/kill_n_check.sh
View file

@ -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'"

2
mysql-test/t/log.sh
View file

@ -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

2
mysql-test/t/wait_for_process.sh
View file

@ -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'"

2
mysql-test/t/wait_for_socket.sh
View file

@ -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'"