Merge pull request percona#2003 from kamil-holubicki/80-null-merge

Null merge 8.0 -> 8.4

mysql-test/include/mtr_check.sql

@@ -262,24 +262,6 @@ BEGIN
     Drop_role_priv, Password_reuse_history, Password_reuse_time, Password_require_current, User_attributes 
   FROM mysql.user ORDER BY Host, User;
 
-  -- During the installation of Percona Telemetry Component we create 'percona.telemetry'.
-  -- It happens during the server startup, so servers started during the test will have the same user
-  -- with different password_last_changed timestamps.
-  -- Some tests (e.g. clone plugin related) restore the clone instance state by cloning the donor. In such a case restored
-  -- instance will have different timestamps at the beginning and the end of the test and MTR check will complain because of
-  -- different tables checksums.
-  -- Workaround this problem by excluding mysql.user from checksum calculation. 
-  -- Instead, dump the table but without password_last_changed column.
-  -- This is the same approach as for INFORMATION_SCHEMA.ROUTINES above.
-  SELECT /*+SET_VAR(use_secondary_engine=OFF)*/ Host, User, Select_priv, Insert_priv, Update_priv, Delete_priv, Create_priv,
-    Drop_priv, Reload_priv, Shutdown_priv, Process_priv, File_priv, Grant_priv, References_priv, Index_priv, Alter_priv,
-    Show_db_priv, Super_priv, Create_tmp_table_priv, Lock_tables_priv, Execute_priv, Repl_slave_priv, Repl_client_priv,
-    Create_view_priv, Show_view_priv, Create_routine_priv, Alter_routine_priv, Create_user_priv, Event_priv, Trigger_priv,
-    Create_tablespace_priv, ssl_type, ssl_cipher, x509_issuer, x509_subject, max_questions, max_updates, max_connections,
-    max_user_connections, plugin, authentication_string, password_expired, password_lifetime, account_locked, Create_role_priv,
-    Drop_role_priv, Password_reuse_history, Password_reuse_time, Password_require_current, User_attributes 
-  FROM mysql.user ORDER BY Host, User;
-
   -- Checksum system tables to make sure they have been properly
   -- restored after test.
   -- skip mysql.proc however, as created timestamps may have been updated by