diff options
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/ps_grant.result | 9 | ||||
| -rw-r--r-- | mysql-test/t/ps_grant.test | 11 |
2 files changed, 12 insertions, 8 deletions
diff --git a/mysql-test/r/ps_grant.result b/mysql-test/r/ps_grant.result index 4792a781419..8fbb06fe61b 100644 --- a/mysql-test/r/ps_grant.result +++ b/mysql-test/r/ps_grant.result @@ -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; 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; |