Change --skip-gtid-uuid to --master-uuid. Make test more reliable. Simplify code and clean up docs.

This commit is contained in:
Daniel Nichter
2014-05-28 13:31:10 -07:00
parent b3c6a0aac2
commit 3b96187313
5 changed files with 174 additions and 143 deletions

View File

@@ -315,13 +315,16 @@ case $opt in
fi
if [ $? -eq 0 -a "$MYSQL_VERSION" '>' "4.1" ]; then
echo -n "Loading sakila database... "
./load-sakila-db 12345 "${2:-""}"
exit_status=$((exit_status | $?))
if [ $exit_status -ne 0 ]; then
echo "FAILED"
else
echo "OK"
SAKILA=${SAKILA:-1}
if [ $SAKILA -eq 1 ]; then
echo -n "Loading sakila database... "
./load-sakila-db 12345 "${2:-""}"
exit_status=$((exit_status | $?))
if [ $exit_status -ne 0 ]; then
echo "FAILED"
else
echo "OK"
fi
fi
# Create percona_test db and checksum all the tables.