summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Black <daniel@mariadb.org>2021-07-20 09:19:23 +1000
committerDaniel Black <daniel@mariadb.org>2021-07-21 17:02:49 +1000
commit8642f592e6e447267eeb0db79a8a38752519d2b9 (patch)
tree25f0427037c120d88172e6d3d2097a871467bef2
parentb4ec3313f6bb3a222b3528b5a8a6dca73b870c20 (diff)
downloadmariadb-git-8642f592e6e447267eeb0db79a8a38752519d2b9.tar.gz
debian/salsa: Show complete auth and plugin situtation
SHOW PLUGINS has a more complete view of the installed plugins into the server. The mysql.user is a compatibility view that doesn't show the complete authentication picture. Use global_priv. Add `show create user` for default users to more clearly represent its contents.
-rw-r--r--debian/salsa-ci.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/debian/salsa-ci.yml b/debian/salsa-ci.yml
index 29ea9afd9d0..45847909192 100644
--- a/debian/salsa-ci.yml
+++ b/debian/salsa-ci.yml
@@ -751,8 +751,8 @@ mariadb.org-10.2 to mariadb-10.5 upgrade:
# prepending with --defaults-file=/etc/mysql/debian.cnf is needed in upstream 5.5–10.3
- mysql --defaults-file=/etc/mysql/debian.cnf --skip-column-names -e "SELECT @@version, @@version_comment"
- echo 'SHOW DATABASES;' | mysql --defaults-file=/etc/mysql/debian.cnf
- - mysql --defaults-file=/etc/mysql/debian.cnf -e "SELECT Host,User,plugin,authentication_string FROM user;" mysql
- - mysql --defaults-file=/etc/mysql/debian.cnf -e "SELECT * FROM plugin;" mysql
+ - mysql --defaults-file=/etc/mysql/debian.cnf -e "SELECT * FROM mysql.global_priv; SHOW CREATE USER root@localhost; SHOW CREATE USER 'mariadb.sys'@localhost"
+ - mysql --defaults-file=/etc/mysql/debian.cnf -e "SELECT * FROM mysql.plugin; SHOW PLUGINS"
- *test-install
- service mysql status
- sleep 5 # Give the mysql_upgrade a bit of time to complete before querying the server