diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-01-27 08:45:36 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-01-27 08:45:36 +0100 |
| commit | 9b4a179d69a1c795bef303a88f9d3195669f00ec (patch) | |
| tree | 87811d81af231e2945468ead0cba58cfc5514548 /mysql-test/main/mysql_upgrade-6984.test | |
| parent | 020dc54dabe64f238e8ef4f50a630a22e0f06949 (diff) | |
| parent | 7db489fc7dea2b4c236807035e57f169074c6682 (diff) | |
| download | mariadb-git-10.3-merge.tar.gz | |
Merge branch '10.2' into bb-10.3-release10.3-merge
Diffstat (limited to 'mysql-test/main/mysql_upgrade-6984.test')
| -rw-r--r-- | mysql-test/main/mysql_upgrade-6984.test | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/main/mysql_upgrade-6984.test b/mysql-test/main/mysql_upgrade-6984.test index 9bbfbeb3f87..89ebd46e3ba 100644 --- a/mysql-test/main/mysql_upgrade-6984.test +++ b/mysql-test/main/mysql_upgrade-6984.test @@ -13,6 +13,7 @@ update mysql.user set password=password("foo") where user='root'; +--replace_regex /[^ ]*mysql_upgrade_info/...mysql_upgrade_info/ --exec $MYSQL_UPGRADE connect(con1,localhost,root,foo,,,); @@ -21,3 +22,6 @@ update mysql.user set password='' 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 |