diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-07-22 10:11:08 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-07-22 10:11:08 +0300 |
| commit | 641f09398fdc37c6f3b0ec6731d5f246ecf24866 (patch) | |
| tree | 0c6e4a290119928a42ad6ffe9d4bdb372d5482f1 /debian | |
| parent | f43370baf3b00733ddfe0f704520a07092fc9a0e (diff) | |
| parent | 82d5994520c239da1b6edf1b24e08138ae0c753d (diff) | |
| download | mariadb-git-641f09398fdc37c6f3b0ec6731d5f246ecf24866.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/salsa-ci.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/debian/salsa-ci.yml b/debian/salsa-ci.yml index 5c959b6c86d..26118f19b65 100644 --- a/debian/salsa-ci.yml +++ b/debian/salsa-ci.yml @@ -732,8 +732,8 @@ mariadb.org-10.2 to mariadb-10.6 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 |