MDEV-17658 change the structure of mysql.user table

Implement User_table_json.
Fix scripts to use mysql.global_priv.
Fix tests.

1 files changed, 5 insertions, 5 deletions

diff --git a/mysql-test/main/lock_multi.result b/mysql-test/main/lock_multi.result
index 5441ba1ecb4..30cd63e60ed 100644
--- a/mysql-test/main/lock_multi.result
+++ b/mysql-test/main/lock_multi.result
@@ -118,17 +118,17 @@ LOCK TABLES columns_priv WRITE, db WRITE, user WRITE;
 FLUSH TABLES;
 connection reader;
 USE mysql;
-SELECT user.Select_priv FROM user, db WHERE user.user = db.user LIMIT 1;
+SELECT global_priv.host FROM global_priv, db WHERE global_priv.user = db.user LIMIT 1;
 connection locker;
-OPTIMIZE TABLES columns_priv, db, user;
+OPTIMIZE TABLES columns_priv, db, global_priv;
 Table	Op	Msg_type	Msg_text
 mysql.columns_priv	optimize	status	OK
 mysql.db	optimize	status	OK
-mysql.user	optimize	status	OK
+mysql.global_priv	optimize	status	OK
 UNLOCK TABLES;
 connection reader;
-Select_priv
-N
+host
+localhost
 USE test;
 connection locker;
 use test;