Now we have a new default user, we should save/restore it in testing, to ensure we get the right timestamps etc.

Author: MarkLeith

mysql-test/suite/sysschema/r/mysqldump.result

@@ -1,3 +1,5 @@
+CREATE TEMPORARY TABLE tmp_user AS SELECT * FROM mysql.user;
+CREATE TEMPORARY TABLE tmp_tables_priv AS SELECT * FROM mysql.tables_priv;
 DROP DATABASE sys;
 SHOW DATABASES;
 Database
@@ -48,3 +50,10 @@ mysql
 performance_schema
 sys
 test
+TRUNCATE TABLE mysql.user;
+INSERT INTO mysql.user (SELECT * FROM tmp_user);
+DROP TEMPORARY TABLE tmp_user;
+TRUNCATE TABLE mysql.tables_priv;
+INSERT INTO mysql.tables_priv (SELECT * FROM tmp_tables_priv);
+DROP TEMPORARY TABLE tmp_tables_priv;
+FLUSH PRIVILEGES;

mysql-test/suite/sysschema/t/mysqldump.test

@@ -3,6 +3,11 @@
 # Dump all databases
 --exec $MYSQL_DUMP -uroot --all-databases > $MYSQLTEST_VARDIR/tmp/bug20902791.sql
 
+# Save a copy of the user/tables_priv, to restore later
+# Otherwise the final mysql_upgrade will REPLACE and update timestamps etc.
+CREATE TEMPORARY TABLE tmp_user AS SELECT * FROM mysql.user;
+CREATE TEMPORARY TABLE tmp_tables_priv AS SELECT * FROM mysql.tables_priv;
+
 # Remove the sys schema
 DROP DATABASE sys;
 
@@ -15,3 +20,14 @@ SHOW DATABASES;
 # Finally reload the sys schema to return to normal
 --exec $MYSQL_UPGRADE --skip-verbose --force
 SHOW DATABASES;
+
+# Restore the saved privileges
+TRUNCATE TABLE mysql.user;
+INSERT INTO mysql.user (SELECT * FROM tmp_user);
+DROP TEMPORARY TABLE tmp_user;
+
+TRUNCATE TABLE mysql.tables_priv;
+INSERT INTO mysql.tables_priv (SELECT * FROM tmp_tables_priv);
+DROP TEMPORARY TABLE tmp_tables_priv;
+
+FLUSH PRIVILEGES;