database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Better error messages for mysql-test-run

Browse Source 
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
This commit is contained in:
unknown
2002-08-06 16:12:52 +03:00
parent 4c1712e401
commit 72345f2b47
4 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mysql-test/mysql-test-run.sh
View File

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