diff options
| author | unknown <konstantin@mysql.com> | 2005-06-17 00:34:35 +0400 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2005-06-17 00:34:35 +0400 |
| commit | abbdea480a7900e4e76320e9419e32516eb59641 (patch) | |
| tree | 0dea838e5cf9b6ff20c6627b8c9ae6aa6f96192c /mysql-test/r/ps_grant.result | |
| parent | 56eba304a64f6bc27ed600d6ba7b7d764b849e77 (diff) | |
| parent | f21a807d44c8599e298417bd825be0f7069f7746 (diff) | |
| download | mariadb-git-abbdea480a7900e4e76320e9419e32516eb59641.tar.gz | |
Manual merge (4.1->5.0)
Diffstat (limited to 'mysql-test/r/ps_grant.result')
| -rw-r--r-- | mysql-test/r/ps_grant.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/ps_grant.result b/mysql-test/r/ps_grant.result index 8fbb06fe61b..651ac171e5d 100644 --- a/mysql-test/r/ps_grant.result +++ b/mysql-test/r/ps_grant.result @@ -90,5 +90,5 @@ 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 +number root localhost test Execute time NULL show full processlist deallocate prepare stmt4; |