diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-07-01 18:15:00 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-07-01 18:15:00 +0000 |
| commit | a2a2e32c02643a0cec111511220227703fda1cd5 (patch) | |
| tree | 69cc2b631234c2a8e026b9cd4d72676c61c594df /mysql-test/main/upgrade_MDEV-23102-2.test | |
| parent | Releasing progress-linux version 1:10.11.8-1~progress7.99u1. (diff) | |
| download | mariadb-a2a2e32c02643a0cec111511220227703fda1cd5.tar.xz mariadb-a2a2e32c02643a0cec111511220227703fda1cd5.zip | |
Merging upstream version 1:11.4.2.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'mysql-test/main/upgrade_MDEV-23102-2.test')
| -rw-r--r-- | mysql-test/main/upgrade_MDEV-23102-2.test | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/main/upgrade_MDEV-23102-2.test b/mysql-test/main/upgrade_MDEV-23102-2.test index f2d7ac57..d55ebe03 100644 --- a/mysql-test/main/upgrade_MDEV-23102-2.test +++ b/mysql-test/main/upgrade_MDEV-23102-2.test @@ -96,8 +96,8 @@ let $MYSQLD_DATADIR= `select @@datadir`; --echo # Run mysql_upgrade --exec $MYSQL_UPGRADE 2>&1 ---file_exists $MYSQLD_DATADIR/mysql_upgrade_info ---remove_file $MYSQLD_DATADIR/mysql_upgrade_info +--file_exists $MYSQLD_DATADIR/mariadb_upgrade_info +--remove_file $MYSQLD_DATADIR/mariadb_upgrade_info --echo # check new definitions mysql_upgrade @@ -116,8 +116,8 @@ select count(*) from global_priv where user='mariadb.sys' and host='localhost'; DROP USER 'superuser'@'localhost'; DROP VIEW mysql.user; --exec $MYSQL_UPGRADE 2>&1 ---file_exists $MYSQLD_DATADIR/mysql_upgrade_info ---remove_file $MYSQLD_DATADIR/mysql_upgrade_info +--file_exists $MYSQLD_DATADIR/mariadb_upgrade_info +--remove_file $MYSQLD_DATADIR/mariadb_upgrade_info delete from global_priv; delete from tables_priv; |