main.skip_grants cleanup

mysql-test/r/skip_grants.result

 use test;
-DROP VIEW IF EXISTS v1;
-DROP VIEW IF EXISTS v2;
-DROP VIEW IF EXISTS v3;
-DROP TABLE IF EXISTS t1;
-DROP PROCEDURE IF EXISTS p1;
-DROP PROCEDURE IF EXISTS p2;
-DROP PROCEDURE IF EXISTS p3;
-DROP FUNCTION IF EXISTS f1;
-DROP FUNCTION IF EXISTS f2;
-DROP FUNCTION IF EXISTS f3;
 CREATE TABLE t1(c INT);
 CREATE TRIGGER t1_bi BEFORE INSERT ON t1
 FOR EACH ROW
@@ -58,10 +48,16 @@ DROP PROCEDURE p3;
 DROP FUNCTION f1;
 DROP FUNCTION f2;
 DROP FUNCTION f3;
+#
+# Bug #26807 "set global event_scheduler=1" and --skip-grant-tables crashes server
+#
 set global event_scheduler=1;
 Warnings:
 Note	1408	Event Scheduler: Loaded 0 events
 set global event_scheduler=0;
+#
+# Bug#26285 Selecting information_schema crahes server
+#
 select count(*) from information_schema.COLUMN_PRIVILEGES;
 count(*)
 0
@@ -74,14 +70,21 @@ count(*)
 select count(*) from information_schema.USER_PRIVILEGES;
 count(*)
 0
-End of 5.0 tests
+#
+# End of 5.0 tests
+#
 #
 # Bug#29817 Queries with UDF fail with non-descriptive error
 # if mysql.proc is missing
 #
 select no_such_function(1);
 ERROR 42000: FUNCTION test.no_such_function does not exist
-End of 5.1 tests
+#
+# End of 5.1 tests
+#
+#
+# MDEV-8280 crash in 'show global status' with --skip-grant-tables
+#
 show global status like 'Acl%';
 Variable_name	Value
 Acl_column_grants	0
@@ -93,3 +96,6 @@ Acl_role_grants	0
 Acl_roles	0
 Acl_table_grants	0
 Acl_users	0
+#
+# End of 10.1 tests
+#

mysql-test/t/skip_grants.test

@@ -17,24 +17,6 @@ use test;
 
 # Prepare.
 
---disable_warnings
-
-DROP VIEW IF EXISTS v1;
-DROP VIEW IF EXISTS v2;
-DROP VIEW IF EXISTS v3;
-
-DROP TABLE IF EXISTS t1;
-
-DROP PROCEDURE IF EXISTS p1;
-DROP PROCEDURE IF EXISTS p2;
-DROP PROCEDURE IF EXISTS p3;
-
-DROP FUNCTION IF EXISTS f1;
-DROP FUNCTION IF EXISTS f2;
-DROP FUNCTION IF EXISTS f3;
-
---enable_warnings
-
 # Test case.
 
 CREATE TABLE t1(c INT);
@@ -109,20 +91,23 @@ DROP FUNCTION f1;
 DROP FUNCTION f2;
 DROP FUNCTION f3;
 
-#
-# Bug #26807 "set global event_scheduler=1" and --skip-grant-tables crashes server
-#
+--echo #
+--echo # Bug #26807 "set global event_scheduler=1" and --skip-grant-tables crashes server
+--echo #
 set global event_scheduler=1;
 set global event_scheduler=0;
 
-#
-# Bug#26285 Selecting information_schema crahes server
-#
+--echo #
+--echo # Bug#26285 Selecting information_schema crahes server
+--echo #
 select count(*) from information_schema.COLUMN_PRIVILEGES;
 select count(*) from information_schema.SCHEMA_PRIVILEGES;
 select count(*) from information_schema.TABLE_PRIVILEGES;
 select count(*) from information_schema.USER_PRIVILEGES;
---echo End of 5.0 tests
+
+--echo #
+--echo # End of 5.0 tests
+--echo #
 
 --echo #
 --echo # Bug#29817 Queries with UDF fail with non-descriptive error
@@ -131,9 +116,15 @@ select count(*) from information_schema.USER_PRIVILEGES;
 --error ER_SP_DOES_NOT_EXIST
 select no_such_function(1);
 
---echo End of 5.1 tests
+--echo #
+--echo # End of 5.1 tests
+--echo #
 
-#
-# MDEV-8280 crash in 'show global status' with --skip-grant-tables
-#
+--echo #
+--echo # MDEV-8280 crash in 'show global status' with --skip-grant-tables
+--echo #
 show global status like 'Acl%';
+
+--echo #
+--echo # End of 10.1 tests
+--echo #