revoke all tests

Author: James Cor

enginetest/queries/priv_auth_queries.go

@@ -1238,7 +1238,11 @@ var UserPrivTests = []UserPrivilegeTest{
 			"CREATE TABLE test (pk BIGINT PRIMARY KEY);",
 			"INSERT INTO test VALUES (1), (2), (3);",
 			"CREATE USER tester@localhost;",
+			"CREATE USER tester1@localhost;",
+			"CREATE USER tester2@localhost;",
 			"GRANT ALL ON *.* TO tester@localhost;",
+			"GRANT ALL ON *.* TO tester1@localhost WITH GRANT OPTION;",
+			"GRANT ALL ON *.* TO tester2@localhost WITH GRANT OPTION;",
 		},
 		Assertions: []UserPrivilegeTestAssertion{
 			{
@@ -1280,8 +1284,46 @@ var UserPrivTests = []UserPrivilegeTest{
 			{
 				User:     "root",
 				Host:     "localhost",
-				Query:    "SELECT User, Host, Select_priv, Insert_priv FROM mysql.user WHERE User = 'tester';",
-				Expected: []sql.Row{{"tester", "localhost", "N", "N"}},
+				Query:    "SELECT User, Host, Select_priv, Insert_priv, Grant_priv FROM mysql.user WHERE User = 'tester';",
+				Expected: []sql.Row{{"tester", "localhost", "N", "N", "N"}},
+			},
+
+			{
+				User:     "root",
+				Host:     "localhost",
+				Query:    "SELECT User, Host, Select_priv, Insert_priv, Grant_priv FROM mysql.user WHERE User = 'tester1';",
+				Expected: []sql.Row{{"tester1", "localhost", "Y", "Y", "Y"}},
+			},
+			{
+				User:     "root",
+				Host:     "localhost",
+				Query:    "REVOKE ALL, GRANT OPTION FROM tester1@localhost;",
+				Expected: []sql.Row{{types.NewOkResult(0)}},
+			},
+			{
+				User:     "root",
+				Host:     "localhost",
+				Query:    "SELECT User, Host, Select_priv, Insert_priv, Grant_priv FROM mysql.user WHERE User = 'tester1';",
+				Expected: []sql.Row{{"tester1", "localhost", "N", "N", "N"}},
+			},
+
+			{
+				User:     "root",
+				Host:     "localhost",
+				Query:    "SELECT User, Host, Select_priv, Insert_priv, Grant_priv FROM mysql.user WHERE User = 'tester2';",
+				Expected: []sql.Row{{"tester2", "localhost", "Y", "Y", "Y"}},
+			},
+			{
+				User:     "root",
+				Host:     "localhost",
+				Query:    "REVOKE ALL PRIVILEGES, GRANT OPTION FROM tester2@localhost;",
+				Expected: []sql.Row{{types.NewOkResult(0)}},
+			},
+			{
+				User:     "root",
+				Host:     "localhost",
+				Query:    "SELECT User, Host, Select_priv, Insert_priv, Grant_priv FROM mysql.user WHERE User = 'tester2';",
+				Expected: []sql.Row{{"tester2", "localhost", "N", "N", "N"}},
 			},
 		},
 	},