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 | 574f6c8dccb7d0e56cfb6ebbbbfeaa115bd247e0 (patch) | |
| tree | 0dea838e5cf9b6ff20c6627b8c9ae6aa6f96192c /mysql-test | |
| parent | f2e153e53f412e9d88c3fb0f97725031e15edf13 (diff) | |
| parent | c0484a301f1dfdac6b63b25cf0e4697a2ad9d05c (diff) | |
| download | mariadb-git-574f6c8dccb7d0e56cfb6ebbbbfeaa115bd247e0.tar.gz | |
Manual merge (4.1->5.0)
Diffstat (limited to 'mysql-test')
| -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; |