diff options
| author | Monty <monty@mariadb.org> | 2020-09-25 15:58:08 +0300 |
|---|---|---|
| committer | Daniel Black <daniel@mariadb.org> | 2020-09-26 08:57:56 +1000 |
| commit | e0f5e7bc9ef306a76c5bf4e067ee5c1a9a7b6187 (patch) | |
| tree | b7adc0b47f1d7533fcde387d21760dfdcfa53f40 /mysql-test | |
| parent | 1be8ac390d3665d061141fe50a1c9e63b7b4b294 (diff) | |
| download | mariadb-git-bb-10.1-danielblack-mysqlupgrade-revert.tar.gz | |
Reverted wrong patch for mysql_upgradebb-10.1-danielblack-mysqlupgrade-revert
The original code was correct. mysql_upgrade calls the mysql client to
talk with MariaDB. It doesn't call itself!
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/mysql_upgrade.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/mysql_upgrade.result b/mysql-test/r/mysql_upgrade.result index a1464bb4853..69637f4078f 100644 --- a/mysql-test/r/mysql_upgrade.result +++ b/mysql-test/r/mysql_upgrade.result @@ -142,7 +142,7 @@ test Phase 7/7: Running 'FLUSH PRIVILEGES' OK DROP USER mysqltest1@'%'; -Version check failed. Got the following error when calling the 'mysql_upgrade' command line client +Version check failed. Got the following error when calling the 'mysql' command line client ERROR 1045 (28000): Access denied for user 'mysqltest1'@'localhost' (using password: YES) FATAL ERROR: Upgrade failed Run mysql_upgrade with a non existing server socket @@ -405,7 +405,7 @@ OK # Bug #21489398: MYSQL_UPGRADE: FATAL ERROR: UPGRADE FAILED - IMPROVE ERROR # Run mysql_upgrade with unauthorized access -Version check failed. Got the following error when calling the 'mysql_upgrade' command line client +Version check failed. Got the following error when calling the 'mysql' command line client ERROR 1045 (28000): Access denied for user 'root'@'localhost' (using password: YES) FATAL ERROR: Upgrade failed # |