More post-merge fixes.

1 files changed, 7 insertions, 4 deletions

diff --git a/mysql-test/t/ps_grant.test b/mysql-test/t/ps_grant.test
index f23582633b4..0b33a2dadde 100644
--- a/mysql-test/t/ps_grant.test
+++ b/mysql-test/t/ps_grant.test
@@ -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;