summaryrefslogtreecommitdiff
path: root/mysql-test/mysql-test-run.sh
diff options
context:
space:
mode:
authormonty@hundin.mysql.fi <>2002-08-06 16:12:52 +0300
committermonty@hundin.mysql.fi <>2002-08-06 16:12:52 +0300
commit4e5b087172c16cfd697c351357c2c965dbdf9f75 (patch)
treeec56e69057df802b4810a80947eb79d8ffdd2a99 /mysql-test/mysql-test-run.sh
parent274f80626ef9d612c5ad5c570bc163b9a2f65a34 (diff)
downloadmariadb-git-4e5b087172c16cfd697c351357c2c965dbdf9f75.tar.gz
Better error messages for mysql-test-run
Added option --host to mysqlhotcopy
Diffstat (limited to 'mysql-test/mysql-test-run.sh')
-rw-r--r--mysql-test/mysql-test-run.sh10
1 files changed, 7 insertions, 3 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh
index 4898d9c5464..566702a7330 100644
--- a/mysql-test/mysql-test-run.sh
+++ b/mysql-test/mysql-test-run.sh
@@ -344,7 +344,11 @@ SLAVE_MYSQLD=$MYSQLD #this can be changed later if we are doing gcov
#--
wait_for_server_start ()
{
- $MYSQLADMIN --no-defaults -u $DBUSER --silent -O connect_timeout=10 -w2 --host=$hostname --port=$1 ping >/dev/null 2>&1
+ $MYSQLADMIN --no-defaults -u $DBUSER --silent -O connect_timeout=10 -w3 --host=$hostname --port=$1 ping >/dev/null 2>&1
+ exit_code=$?
+ if [ $exit_code != 0 ]; then
+ echo "Error: Could not start $2, exit code $exit_code";
+ fi
}
prompt_user ()
@@ -553,7 +557,7 @@ start_master()
else
$MYSQLD $master_args >> $MASTER_MYERR 2>&1 &
fi
- wait_for_server_start $MASTER_MYPORT
+ wait_for_server_start $MASTER_MYPORT master
MASTER_RUNNING=1
}
@@ -610,7 +614,7 @@ start_slave()
else
$SLAVE_MYSQLD $slave_args >> $SLAVE_MYERR 2>&1 &
fi
- wait_for_server_start $SLAVE_MYPORT
+ wait_for_server_start $SLAVE_MYPORT slave
SLAVE_RUNNING=1
}