diff options
| author | unknown <monty@mysql.com> | 2005-07-28 21:39:24 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-07-28 21:39:24 +0300 |
| commit | f11418f76f54614ad3dcc82da4172195667663f0 (patch) | |
| tree | 0f997c96cf51888782a8e0819c80112e43883387 /mysql-test/r/ps_grant.result | |
| parent | 36b6bf2ef32e3f5932578936489318b2711b7676 (diff) | |
| download | mariadb-git-f11418f76f54614ad3dcc82da4172195667663f0.tar.gz | |
After merge fixes
mysql-test/r/func_group.result:
Update results after merge (things moved around when aligning 4.1 and 5.0 tests)
mysql-test/r/mysqldump.result:
Update results after merge (things moved around when aligning 4.1 and 5.0 tests)
mysql-test/r/ps_grant.result:
Update results after merge (test moved to another file)
mysql-test/t/mysqldump.test:
Align with other lines
sql/lock.cc:
Removed compiler warning
Fixed typo during merge
Diffstat (limited to 'mysql-test/r/ps_grant.result')
| -rw-r--r-- | mysql-test/r/ps_grant.result | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/mysql-test/r/ps_grant.result b/mysql-test/r/ps_grant.result index fa963f944b5..fdc1f97bb4c 100644 --- a/mysql-test/r/ps_grant.result +++ b/mysql-test/r/ps_grant.result @@ -88,8 +88,3 @@ 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 Execute time NULL show full processlist -deallocate prepare stmt4; |