summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2020-07-02 18:40:45 +0000
committerGerrit Code Review <review@openstack.org>2020-07-02 18:40:46 +0000
commit43802e5170595ce20cee73517e1e4d7c81fef079 (patch)
tree4961232e56978e3f73b1f65e900beaaa2577a4a6 /tools
parent1c102141db2305ade598c5d58af9017e08113699 (diff)
parente0d541073da06a583681774b2ecb61bf5a9bd2d1 (diff)
downloadnova-43802e5170595ce20cee73517e1e4d7c81fef079.tar.gz
Merge "Fix user creation with GRANT in MySQL 8.0(Ubuntu Focal)"
Diffstat (limited to 'tools')
-rwxr-xr-xtools/test-setup.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/test-setup.sh b/tools/test-setup.sh
index 00c765e734..5b986ced36 100755
--- a/tools/test-setup.sh
+++ b/tools/test-setup.sh
@@ -23,8 +23,8 @@ sudo -H mysqladmin -u root password $DB_ROOT_PW
sudo -H mysql -u root -p$DB_ROOT_PW -h localhost -e "
DELETE FROM mysql.user WHERE User='';
FLUSH PRIVILEGES;
- GRANT ALL PRIVILEGES ON *.*
- TO '$DB_USER'@'%' identified by '$DB_PW' WITH GRANT OPTION;"
+ CREATE USER '$DB_USER'@'%' IDENTIFIED BY '$DB_PW';
+ GRANT ALL PRIVILEGES ON *.* TO '$DB_USER'@'%' WITH GRANT OPTION;"
# Now create our database.
mysql -u $DB_USER -p$DB_PW -h 127.0.0.1 -e "