From e95557a045b0a35e8938e15924d9a7a8cb51a407 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 15 Aug 2003 09:54:19 +0300 Subject: Cleanups to recent patches Fix packet error when using wrong GRANT command include/config-win.h: Changed back to test for HAVE_SETFILEPOINTER instead of operating system mysql-test/r/grant.result: Extra test to catch wrong packet bug mysql-test/t/grant.test: Extra test to catch wrong packet bug mysys/my_chsize.c: Cleanup sql/opt_range.cc: Fix to recent BETWEEN patch sql/sql_acl.cc: Fix packet error when using wrong GRANT command sql/sql_select.cc: Cleanups Added not critical out-of-memory check --- mysql-test/r/grant.result | 3 +++ 1 file changed, 3 insertions(+) (limited to 'mysql-test/r/grant.result') diff --git a/mysql-test/r/grant.result b/mysql-test/r/grant.result index fccd3715af7..4ce22e84dd5 100644 --- a/mysql-test/r/grant.result +++ b/mysql-test/r/grant.result @@ -108,3 +108,6 @@ flush privileges; drop table t1; GRANT FILE on mysqltest.* to mysqltest_1@localhost; Wrong usage of DB GRANT and GLOBAL PRIVILEGES +select 1; +1 +1 -- cgit v1.2.1 From bd6347df9318f46f715615e2a33ff9ba2d9dbb59 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 22 Aug 2003 18:32:11 +0300 Subject: grant.result, grant.test, sql_acl.cc: Fix for a bug #878 sql/sql_acl.cc: Fix for a bug #878 mysql-test/t/grant.test: Fix for a bug #878 mysql-test/r/grant.result: Fix for a bug #878 --- mysql-test/r/grant.result | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'mysql-test/r/grant.result') diff --git a/mysql-test/r/grant.result b/mysql-test/r/grant.result index fccd3715af7..8f9fa13a070 100644 --- a/mysql-test/r/grant.result +++ b/mysql-test/r/grant.result @@ -100,6 +100,26 @@ GRANT SELECT, REFERENCES, REFERENCES (a) ON `test`.`t1` TO 'mysqltest_1'@'localh select table_priv,column_priv from mysql.tables_priv where user="mysqltest_1"; table_priv column_priv Select,References References +grant all on test.* to user1@localhost with grant option; +revoke all on test.* from user1@localhost; +show grants for user1@localhost; +Grants for user1@localhost +GRANT USAGE ON *.* TO 'user1'@'localhost' +GRANT USAGE ON `test`.* TO 'user1'@'localhost' WITH GRANT OPTION +revoke grant option on test.* from user1@localhost; +show grants for user1@localhost; +Grants for user1@localhost +GRANT USAGE ON *.* TO 'user1'@'localhost' +grant all on test.t1 to user2@localhost with grant option; +revoke all on test.t1 from user2@localhost; +show grants for user2@localhost; +Grants for user2@localhost +GRANT USAGE ON *.* TO 'user2'@'localhost' +GRANT USAGE ON `test`.`t1` TO 'user2'@'localhost' WITH GRANT OPTION +revoke grant option on test.t1 from user2@localhost; +show grants for user2@localhost; +Grants for user2@localhost +GRANT USAGE ON *.* TO 'user2'@'localhost' delete from mysql.user where user='mysqltest_1'; delete from mysql.db where user='mysqltest_1'; delete from mysql.tables_priv where user='mysqltest_1'; -- cgit v1.2.1