[DRE-commits] [ruby-em-synchrony] 08/16: debian/start_services_and_run.sh: call mysql with the right user

[Lucas Kanashiro]

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

kanashiro-guest pushed a commit to branch master
in repository ruby-em-synchrony.

commit 25a73c12d54f24b6bb6676e5c23217c0571d1c24
Author: Lucas Kanashiro <kanashiro.duarte at gmail.com>
Date:   Wed Mar 2 09:11:01 2016 -0300

    debian/start_services_and_run.sh: call mysql with the right user
---
 debian/start_services_and_run.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/start_services_and_run.sh b/debian/start_services_and_run.sh
index 166ac48..7d9b0a0 100755
--- a/debian/start_services_and_run.sh
+++ b/debian/start_services_and_run.sh
@@ -29,7 +29,7 @@ mysql_install_db --no-defaults --datadir=${MYTEMP_DIR} --force --skip-name-resol
 /usr/sbin/mysqld --no-defaults --user=${DO_MYSQL_USER} --socket=${MYSQL_UNIX_PORT} --datadir=${MYTEMP_DIR} --skip-networking &
 echo -n pinging mysqld.
 attempts=0
-while ! /usr/bin/mysqladmin --socket=${MYSQL_UNIX_PORT} ping ; do
+while ! /usr/bin/mysqladmin --user=${DO_MYSQL_USER} --socket=${MYSQL_UNIX_PORT} ping ; do
   sleep 3
   attempts=$((attempts+1))
   if [ ${attempts} -gt 10 ] ; then
@@ -38,11 +38,11 @@ while ! /usr/bin/mysqladmin --socket=${MYSQL_UNIX_PORT} ping ; do
   fi
 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}';"
+mysql --user=${DO_MYSQL_USER} --socket=${MYSQL_UNIX_PORT} --execute "GRANT ALL PRIVILEGES ON ${DO_MYSQL_DBNAME}.* TO '${DO_MYSQL_USER}'@'localhost' IDENTIFIED BY '${DO_MYSQL_PASS}';"
 
 # Create database for activerecord tests
-mysql --socket=${MYSQL_UNIX_PORT} --execute "create database widgets;"
-mysql --socket=${MYSQL_UNIX_PORT} --execute "create table widgets.widgets (id INT NOT NULL AUTO_INCREMENT, title varchar(255), PRIMARY KEY (id) );"
+mysql --user=${DO_MYSQL_USER} --socket=${MYSQL_UNIX_PORT} --execute "create database widgets;"
+mysql --user=${DO_MYSQL_USER} --socket=${MYSQL_UNIX_PORT} --execute "create table widgets.widgets (id INT NOT NULL AUTO_INCREMENT, title varchar(255), PRIMARY KEY (id) );"
 
 # Start redis server
 redis-server --daemonize yes
@@ -50,10 +50,10 @@ redis-server --daemonize yes
 "$@"
 
 # Drop databases
-mysql --socket=${MYSQL_UNIX_PORT} --execute "drop database widgets;"
+mysql --user=${DO_MYSQL_USER} --socket=${MYSQL_UNIX_PORT} --execute "drop database widgets;"
 
 # Stop mysqld
-/usr/bin/mysqladmin --socket=${MYSQL_UNIX_PORT} shutdown
+/usr/bin/mysqladmin --user=${DO_MYSQL_USER} --socket=${MYSQL_UNIX_PORT} shutdown
 rm -rf ${MYTEMP_DIR}
 
 # Stop memcached and cleanup pid file

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