Support newer versions of MySQL

Change-Id: I79bcd5d345d5cd5c468f7b8647adff85b3608170
This commit is contained in:
Julien Danjou 2015-12-16 17:18:01 +01:00
parent 4101ab5d9f
commit 09866ac641

View File

@ -18,6 +18,7 @@ check_for_cmd mysqld
# Start MySQL process for tests # Start MySQL process for tests
MYSQL_DATA=`mktemp -d /tmp/AODH-MYSQL-XXXXX` MYSQL_DATA=`mktemp -d /tmp/AODH-MYSQL-XXXXX`
trap "clean_exit ${MYSQL_DATA}" EXIT trap "clean_exit ${MYSQL_DATA}" EXIT
mysqld --initialize-insecure --datadir=${MYSQL_DATA} || true
mkfifo ${MYSQL_DATA}/out mkfifo ${MYSQL_DATA}/out
mysqld --datadir=${MYSQL_DATA} --pid-file=${MYSQL_DATA}/mysql.pid --socket=${MYSQL_DATA}/mysql.socket --skip-networking --skip-grant-tables &> ${MYSQL_DATA}/out & mysqld --datadir=${MYSQL_DATA} --pid-file=${MYSQL_DATA}/mysql.pid --socket=${MYSQL_DATA}/mysql.socket --skip-networking --skip-grant-tables &> ${MYSQL_DATA}/out &
# Wait for MySQL to start listening to connections # Wait for MySQL to start listening to connections