[DRE-commits] [ruby-em-synchrony] 01/02: Switch to default-mysql-server for tests

[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-em-synchrony.

commit 0963ab85b5cb8c7d71219705f7ad81e865ca00b2
Author: Christian Hofstaedtler <zeha at debian.org>
Date:   Mon Dec 19 01:16:49 2016 +0000

    Switch to default-mysql-server for tests
    
    Note that the tests are probably only compatible with MariaDB 10.0 now.
    
    Closes: #848288
---
 debian/control                   | 2 +-
 debian/start_services_and_run.sh | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 13c7820..d1d3b82 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders: Jonas Genannt <jonas.genannt at capi2name.de>,
 Build-Depends: debhelper (>= 9),
                gem2deb,
                memcached,
-               mysql-server,
+               default-mysql-server | virtual-mysql-server,
                procps,
                redis-server,
                ruby-activerecord,
diff --git a/debian/start_services_and_run.sh b/debian/start_services_and_run.sh
index 7d9b0a0..b93c752 100755
--- a/debian/start_services_and_run.sh
+++ b/debian/start_services_and_run.sh
@@ -26,7 +26,11 @@ DO_MYSQL_DATABASE=/${DO_MYSQL_DBNAME}
 
 # Start mysqld
 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 --user=${DO_MYSQL_USER} --socket=${MYSQL_UNIX_PORT} ping ; do

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