From de978be955cfbba1156a0cdd16cc9c780be7e8d4 Mon Sep 17 00:00:00 2001 From: Timofey Turenko Date: Wed, 5 Jun 2019 12:57:46 +0300 Subject: [PATCH] remove '-u root' from create_user*.sh Call of MariaDB client from local machine with sudo with '-u root' parameter does not work with 10.4 --- maxscale-system-test/create_user.sh | 2 +- maxscale-system-test/create_user_galera.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/maxscale-system-test/create_user.sh b/maxscale-system-test/create_user.sh index 1eb0cb8f2..b8b6064b7 100755 --- a/maxscale-system-test/create_user.sh +++ b/maxscale-system-test/create_user.sh @@ -1,6 +1,6 @@ #!/bin/bash -mysql -u root --force $1 <& /dev/null +mysql --force $1 <& /dev/null DROP USER IF EXISTS '$node_user'@'%'; CREATE USER '$node_user'@'%' IDENTIFIED BY '$node_password'; diff --git a/maxscale-system-test/create_user_galera.sh b/maxscale-system-test/create_user_galera.sh index a2c231184..e7eff8738 100755 --- a/maxscale-system-test/create_user_galera.sh +++ b/maxscale-system-test/create_user_galera.sh @@ -4,14 +4,14 @@ for ((i=0;i<100;i++)) do - mysql -ss -u root $1 -e 'show status like "wsrep_ready"' | grep 'ON' && break || sleep 1 + mysql -ss $1 -e 'show status like "wsrep_ready"' | grep 'ON' && break || sleep 1 done # The removal of the anonymous ''@'localhost' user is done in a somewhat crude # way. The proper way would be to do a secure installation or drop the users # with DROP USER statements. -mysql -u root --force <