From 8632bdb9894672b225332f253798e8c47a2c06d5 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 28 Jul 2005 21:39:24 +0300 Subject: 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 --- mysql-test/r/ps_grant.result | 5 ----- 1 file changed, 5 deletions(-) (limited to 'mysql-test/r/ps_grant.result') 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; -- cgit v1.2.1