More post-merge fixes. (bb2b8120) · Commits · Software / OSDI20 Artifacts / mariadb

mysql-test/r/ps_grant.result

+5 −4

Original line number	Diff line number	Diff line
		@@ -75,10 +75,6 @@ commit ;
		show grants for second_user@localhost ;
		ERROR 42000: There is no such grant defined for user 'second_user' on host 'localhost'
		drop database mysqltest;
		prepare stmt4 from ' show full processlist ';
		execute stmt4;
		Id User Host db Command Time State Info
		number root localhost test Query time NULL show full processlist
		prepare stmt3 from ' grant all on test.t1 to drop_user@localhost
		identified by ''looser'' ';
		ERROR HY000: This command is not supported in the prepared statement protocol yet
		@@ -91,3 +87,8 @@ revoke all privileges on test.t1 from drop_user@localhost ;
		prepare stmt3 from ' drop user drop_user@localhost ';
		ERROR HY000: This command is not supported in the prepared statement protocol yet
		drop user drop_user@localhost;
		prepare stmt4 from ' show full processlist ';
		execute stmt4;
		Id User Host db Command Time State Info
		number root localhost test Query time NULL show full processlist
		deallocate prepare stmt4;

+7 −4

Original line number	Diff line number	Diff line
		@@ -112,10 +112,6 @@ show grants for second_user@localhost ;

		drop database mysqltest;

		# Tested here simply so it is not tested with embedded server
		prepare stmt4 from ' show full processlist ';
		--replace_column 1 number 6 time 3 localhost
		execute stmt4;

		## grant/revoke + drop user
		--error 1295
		@@ -131,3 +127,10 @@ revoke all privileges on test.t1 from drop_user@localhost ;
		prepare stmt3 from ' drop user drop_user@localhost ';
		drop user drop_user@localhost;

		# This test must be the last one, otherwise it may produce extra
		# rows in the processlist under high load.
		# Tested here simply so it is not tested with embedded server
		prepare stmt4 from ' show full processlist ';
		--replace_column 1 number 6 time 3 localhost
		execute stmt4;
		deallocate prepare stmt4;