From 92ead72dc7c1413749d47c3bf65ee9d25af40f51 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 2 Mar 2006 10:55:55 +0100 Subject: [PATCH 1/2] Make the define start at "start of line" --- sql/net_serv.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql/net_serv.cc b/sql/net_serv.cc index c5794fb4d25..c80bb8bad9a 100644 --- a/sql/net_serv.cc +++ b/sql/net_serv.cc @@ -233,7 +233,7 @@ static int net_data_is_ready(my_socket sd) /* Windows uses an _array_ of 64 fd's as default, so it's safe */ if (sd >= FD_SETSIZE) return -1; - #define NET_DATA_IS_READY_CAN_RETURN_MINUS_ONE +#define NET_DATA_IS_READY_CAN_RETURN_MINUS_ONE #endif FD_ZERO(&sfds); From d5a27fd86fd1cada16d427fd9ffecc08314f4b7e Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 2 Mar 2006 11:01:58 +0100 Subject: [PATCH 2/2] Bug#17279 user with no global privs and with create priv in db can create database - Fix test case for systems with "lowercase names" mysql-test/r/grant2.result: Fix for system with "lowercase names", allow error 1007 to be returned mysql-test/t/grant2.test: Fix for system with "lowercase names", allow error 1007 to be returned --- mysql-test/r/grant2.result | 2 +- mysql-test/t/grant2.test | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/mysql-test/r/grant2.result b/mysql-test/r/grant2.result index 9ddd6d4281e..a42ad0d79a5 100644 --- a/mysql-test/r/grant2.result +++ b/mysql-test/r/grant2.result @@ -349,7 +349,7 @@ Warnings: Warning 1265 Data truncated for column 'Alter_routine_priv' at row 1 FLUSH PRIVILEGES; create database TEStdb; -ERROR 42000: Access denied for user 'mysqltest_1'@'%' to database 'TEStdb' +Got one of the listed errors delete from mysql.user; delete from mysql.db where host='%' and user='mysqltest_1' and db='TESTDB'; insert into mysql.user select * from t1; diff --git a/mysql-test/t/grant2.test b/mysql-test/t/grant2.test index 32861d1b184..2c62d2f1bd3 100644 --- a/mysql-test/t/grant2.test +++ b/mysql-test/t/grant2.test @@ -452,7 +452,8 @@ connect (con1,localhost,mysqltest_1,password,TESTDB); # The user mysqltest_1 should only be allowed access to # database TESTDB, not TEStdb ---error 1044 +# On system with "lowercase names" we get error "1007: Can't create db..." +--error 1044, 1007 create database TEStdb; # Clean-up