[DRE-commits] [ruby-mysql2] 03/05: 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-mysql2.

commit 38e0a5633506fd115853aa0b16b91a7441069db5
Author: Christian Hofstaedtler <zeha at debian.org>
Date:   Mon Dec 19 00:37:38 2016 +0000

    Work around mariadb grant issue
---
 debian/start_mysqld_and_run.sh | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/debian/start_mysqld_and_run.sh b/debian/start_mysqld_and_run.sh
index 295e70a..0dcd94c 100755
--- a/debian/start_mysqld_and_run.sh
+++ b/debian/start_mysqld_and_run.sh
@@ -18,7 +18,11 @@ 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 &
+cat >${MYTEMP_DIR}/init.sql <<EOT
+UPDATE mysql.user SET plugin = "";
+FLUSH PRIVILEGES;
+EOT
+/usr/sbin/mysqld --no-defaults --user=${DO_MYSQL_USER} --socket=${MYSQL_UNIX_PORT} --datadir=${MYTEMP_DIR} --skip-networking --init-file=${MYTEMP_DIR}/init.sql &
 echo -n pinging mysqld.
 attempts=0
 while ! /usr/bin/mysqladmin --socket=${MYSQL_UNIX_PORT} ping ; do
@@ -36,7 +40,7 @@ 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}';"
+# ruby-mysql2 tests use the "test" db.
+mysqladmin --user=${DO_MYSQL_USER} --socket=${MYSQL_UNIX_PORT} create test
 
 "$@"

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