diff options
Diffstat (limited to 'mysql-test/main/mysql_upgrade-6984.result')
| -rw-r--r-- | mysql-test/main/mysql_upgrade-6984.result | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mysql-test/main/mysql_upgrade-6984.result b/mysql-test/main/mysql_upgrade-6984.result index a7b5bcb86bf..87f3c1a5359 100644 --- a/mysql-test/main/mysql_upgrade-6984.result +++ b/mysql-test/main/mysql_upgrade-6984.result @@ -1,4 +1,4 @@ -update mysql.user set password=password("foo") where user='root'; +update mysql.global_priv set priv=json_set(priv, '$.plugin', 'mysql_native_password', '$.authentication_string', password('foo')); Phase 1/7: Checking and upgrading mysql database Processing databases mysql @@ -7,6 +7,7 @@ mysql.columns_priv OK mysql.db OK mysql.event OK mysql.func OK +mysql.global_priv OK mysql.gtid_slave_pos OK mysql.help_category OK mysql.help_keyword OK @@ -35,7 +36,6 @@ mysql.time_zone_transition_type OK mysql.transaction_registry Error : Unknown storage engine 'InnoDB' error : Corrupt -mysql.user OK Repairing tables mysql.innodb_index_stats @@ -49,6 +49,7 @@ Error : Unknown storage engine 'InnoDB' error : Corrupt Phase 2/7: Installing used storage engines... Skipped Phase 3/7: Fixing views +mysql.user OK Phase 4/7: Running 'mysql_fix_privilege_tables' Phase 5/7: Fixing table and database names Phase 6/7: Checking and upgrading tables @@ -62,6 +63,6 @@ test Phase 7/7: Running 'FLUSH PRIVILEGES' OK connect con1,localhost,root,foo,,,; -update mysql.user set password='' where user='root'; +update mysql.global_priv set priv=json_remove(priv, '$.plugin', '$.authentication_string'); flush privileges; set global event_scheduler=OFF; |