[DRE-commits] [ruby-riddle] 03/04: Work around mariadb grant issue

[zeha at debian.org]

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

zeha pushed a commit to branch master
in repository ruby-riddle.

commit cb61c63584aeee938b817b3f79281c4e86deb891
Author: Christian Hofstaedtler <zeha at debian.org>
Date:   Mon Dec 19 00:36:35 2016 +0000

    Work around mariadb grant issue
---
 debian/start_mysqld_and_run.sh | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/debian/start_mysqld_and_run.sh b/debian/start_mysqld_and_run.sh
index 295e70a..11b6db9 100755
--- a/debian/start_mysqld_and_run.sh
+++ b/debian/start_mysqld_and_run.sh
@@ -18,7 +18,7 @@ DO_MYSQL_DBNAME=test
 DO_MYSQL_DATABASE=/${DO_MYSQL_DBNAME}
 
 mysql_install_db --no-defaults --datadir=${MYTEMP_DIR} --force --skip-name-resolve --user=${DO_MYSQL_USER}
-/usr/sbin/mysqld --no-defaults --user=${DO_MYSQL_USER} --socket=${MYSQL_UNIX_PORT} --datadir=${MYTEMP_DIR} --skip-networking &
+/usr/sbin/mysqld --no-defaults --user=${DO_MYSQL_USER} --socket=${MYSQL_UNIX_PORT} --datadir=${MYTEMP_DIR} --skip-networking --skip-grant &
 echo -n pinging mysqld.
 attempts=0
 while ! /usr/bin/mysqladmin --socket=${MYSQL_UNIX_PORT} ping ; do
@@ -36,7 +36,4 @@ cleanup() {
 }
 trap cleanup INT EXIT TERM
 
-# database `test` is already created by default
-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}';"
-
 "$@"

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