[DRE-commits] [ruby-dataobjects-mysql] 01/01: Always shutdown myslqd (copy of zehas fix for ruby-mysql2).

[Tomasz Nitecki]

This is an automated email from the git hooks/post-receive script.

tnnn-guest pushed a commit to branch master
in repository ruby-dataobjects-mysql.

commit f290fb5884cfa9dc95713ed79274100882f60233
Author: Tomasz Nitecki <tnnn at tnnn.pl>
Date:   Fri Apr 10 18:05:22 2015 +0200

    Always shutdown myslqd (copy of zehas fix for ruby-mysql2).
---
 debian/start_mysqld_and_auto_install.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/start_mysqld_and_auto_install.sh b/debian/start_mysqld_and_auto_install.sh
index a70e184..9b5f63d 100644
--- a/debian/start_mysqld_and_auto_install.sh
+++ b/debian/start_mysqld_and_auto_install.sh
@@ -32,10 +32,13 @@ done
 mysql --socket=${MYSQL_UNIX_PORT} --execute "CREATE DATABASE ${DO_MYSQL_DBNAME};"
 mysql --socket=${MYSQL_UNIX_PORT} --execute "GRANT ALL PRIVILEGES ON ${DO_MYSQL_DBNAME}.* TO '${DO_MYSQL_USER}'@'localhost' IDENTIFIED BY '${DO_MYSQL_PASS}';"
 
+# Keep running so we can terminate mysqld.
+set +e
 
 dh_auto_install
+RC=$?
 
 /usr/bin/mysqladmin --socket=${MYSQL_UNIX_PORT} shutdown
 rm -rf ${MYTEMP_DIR}
 
-
+exit $RC

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-dataobjects-mysql.git