diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-08-06 16:12:52 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-08-06 16:12:52 +0300 |
| commit | 72345f2b474310bc72af7fb4e3b25c7051dfd6cd (patch) | |
| tree | ec56e69057df802b4810a80947eb79d8ffdd2a99 /mysql-test | |
| parent | 4c1712e40171e2861359878ea885e14936298acf (diff) | |
| download | mariadb-git-72345f2b474310bc72af7fb4e3b25c7051dfd6cd.tar.gz | |
Better error messages for mysql-test-run
Added option --host to mysqlhotcopy
mysql-test/mysql-test-run.sh:
Added error message if the server doesn't start.
Increase connect timeout a bit (for running under purify).
mysql-test/t/rpl000001.test:
Longer sleep time (for running under purify)
scripts/mysqlhotcopy.sh:
Added option --host for usage with TCP/IP connections
sql/gen_lex_hash.cc:
Fixed typo
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 10 | ||||
| -rw-r--r-- | mysql-test/t/rpl000001.test | 2 |
2 files changed, 8 insertions, 4 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 } diff --git a/mysql-test/t/rpl000001.test b/mysql-test/t/rpl000001.test index 113a9637dac..6a827368fa4 100644 --- a/mysql-test/t/rpl000001.test +++ b/mysql-test/t/rpl000001.test @@ -57,7 +57,7 @@ reap; connection slave; sync_with_master ; #give the slave a chance to exit -sleep 0.5; +sleep 2; # The following test can't be done because the result of Pos will differ # on different computers |