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/mysql_upgrade-6984.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/mysql_upgrade-6984.test')
| -rw-r--r-- | mysql-test/main/mysql_upgrade-6984.test | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/mysql-test/main/mysql_upgrade-6984.test b/mysql-test/main/mysql_upgrade-6984.test index 034310e0..53b1f180 100644 --- a/mysql-test/main/mysql_upgrade-6984.test +++ b/mysql-test/main/mysql_upgrade-6984.test @@ -1,9 +1,9 @@ -# -# MDEV-6984 Can't migrate from MySQL 5.6.21 to MariaDB 10 -# --source include/not_embedded.inc --source include/have_perfschema.inc +--echo # +--echo # MDEV-6984 Can't migrate from MySQL 5.6.21 to MariaDB 10 +--echo # # # When 'root' account is password protected and MYSQL_UPGRADE doesn't # know the password (meaning, MYSQL_UPGRADE is run automatically @@ -14,18 +14,16 @@ update mysql.global_priv set priv=json_set(priv, '$.plugin', 'mysql_native_password', '$.authentication_string', password('foo')) where user='root'; ---replace_regex /[^ ]*mysql_upgrade_info/...mysql_upgrade_info/ +--replace_regex /[^ ]*mariadb_upgrade_info/...mariadb_upgrade_info/ --exec $MYSQL_UPGRADE connect(con1,localhost,root,foo,,,); update mysql.global_priv set priv=json_compact(json_remove(priv, '$.plugin', '$.authentication_string')) where user='root'; flush privileges; -# Load event table -set global event_scheduler=OFF; let MYSQLD_DATADIR= `select @@datadir`; ---remove_file $MYSQLD_DATADIR/mysql_upgrade_info +--remove_file $MYSQLD_DATADIR/mariadb_upgrade_info # --skip-grant-tables state may changed during the test. Need to restart the server # to restore the --skip-grant-tables state. Otherwise MTR's internal check will fail |