diff --git a/mysql-test/main/system_mysql_db_error_log.result b/mysql-test/main/system_mysql_db_error_log.result
index e92c2e74df4..3765316bf88 100644
--- a/mysql-test/main/system_mysql_db_error_log.result
+++ b/mysql-test/main/system_mysql_db_error_log.result
@@ -112,7 +112,7 @@ SHOW GRANTS FOR good_version_id_100500@localhost;
 Grants for good_version_id_100500@localhost
 GRANT SUPER, BINLOG MONITOR, SET USER, FEDERATED ADMIN, CONNECTION ADMIN, READ_ONLY ADMIN, REPLICATION SLAVE ADMIN, REPLICATION MASTER ADMIN, BINLOG ADMIN, BINLOG REPLAY, SLAVE MONITOR ON *.* TO `good_version_id_100500`@`localhost`
 DROP USER good_version_id_100500@localhost;
-FOUND 1 /Warning.*'user' entry 'bad_access1@localhost' has a wrong 'access' value.*version_id=/ in system_mysql_db_error_log.err
+FOUND 1 /Warning.*'user' entry 'bad_access1@localhost' has a wrong 'access' value.*version_id/ in system_mysql_db_error_log.err
 FOUND 1 /Warning.*'user' entry 'bad_version_id_1000000@localhost' has a wrong 'version_id' value 1000000/ in system_mysql_db_error_log.err
 FOUND 1 /Warning.*'user' entry 'bad_version_id_minus_3@localhost' has a wrong 'version_id' value -3/ in system_mysql_db_error_log.err
 FOUND 1 /Warning.*'user' entry 'bad_version_id_100300@localhost' has a wrong 'version_id' value 100300/ in system_mysql_db_error_log.err
diff --git a/mysql-test/main/system_mysql_db_error_log.test b/mysql-test/main/system_mysql_db_error_log.test
index 17c04a9cc14..2e507002f6f 100644
--- a/mysql-test/main/system_mysql_db_error_log.test
+++ b/mysql-test/main/system_mysql_db_error_log.test
@@ -104,7 +104,7 @@ DROP USER good_version_id_100500@localhost;
 
 --let SEARCH_FILE=$MYSQLTEST_VARDIR/tmp/system_mysql_db_error_log.err
 
---let SEARCH_PATTERN= Warning.*'user' entry 'bad_access1@localhost' has a wrong 'access' value.*version_id=
+--let SEARCH_PATTERN= Warning.*'user' entry 'bad_access1@localhost' has a wrong 'access' value.*version_id
 --source include/search_pattern_in_file.inc
 
 --let SEARCH_PATTERN= Warning.*'user' entry 'bad_version_id_1000000@localhost' has a wrong 'version_id' value 1000000
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc
index a59c81a5c45..ac6f0820a06 100644
--- a/sql/sql_acl.cc
+++ b/sql/sql_acl.cc
@@ -1561,10 +1561,10 @@ class User_table_json: public User_table
   {
     sql_print_warning("'user' entry '%s@%s' "
                       "has a wrong 'access' value 0x%llx "
-                      "(allowed mask is 0x%llx, version_id=%lld)",
+                      "(allowed mask is 0x%llx, version_id is %llu)",
                       safe_str(get_user(current_thd->mem_root)),
                       safe_str(get_host(current_thd->mem_root)),
-                      access, mask, version_id);
+                      access, (ulonglong) mask, version_id);
   }
 
   privilege_t adjust_access(ulonglong version_id, ulonglong access) const
@@ -10544,7 +10544,7 @@ static int handle_grant_table(THD *thd, const Grant_table_base& grant_table,
         if (which_table != PROXIES_PRIV_TABLE)
         {
           DBUG_PRINT("loop",("scan fields: '%s'@'%s' '%s' '%s' '%s'",
-                             user_from->user, user_from->host,
+                             user_from->user.str, user_from->host.str,
                              get_field(thd->mem_root, table->field[1]) /*db*/,
                              get_field(thd->mem_root, table->field[3]) /*table*/,
                              get_field(thd->mem_root,