database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-05 13:16:09 +03:00
Code Activity

Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0

Browse Source 
into mysql.com:/M50/mysql-5.0
This commit is contained in:
unknown
2006-03-02 11:07:48 +01:00
parent d2df7f5dac d5a27fd86f
commit b65b476727
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/grant2.result
View File

@@ -349,7 +349,7 @@ Warnings:
Warning 1265 Data truncated for column 'Alter_routine_priv' at row 1 Warning 1265 Data truncated for column 'Alter_routine_priv' at row 1
FLUSH PRIVILEGES; FLUSH PRIVILEGES;
create database TEStdb; 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.user;
delete from mysql.db where host='%' and user='mysqltest_1' and db='TESTDB'; delete from mysql.db where host='%' and user='mysqltest_1' and db='TESTDB';
insert into mysql.user select * from t1; insert into mysql.user select * from t1;

3
mysql-test/t/grant2.test
View File

@@ -452,7 +452,8 @@ connect (con1,localhost,mysqltest_1,password,TESTDB);
# The user mysqltest_1 should only be allowed access to # The user mysqltest_1 should only be allowed access to
# database TESTDB, not TEStdb # 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; create database TEStdb;
# Clean-up # Clean-up

2
sql/net_serv.cc
View File

@@ -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 */ /* Windows uses an _array_ of 64 fd's as default, so it's safe */
if (sd >= FD_SETSIZE) if (sd >= FD_SETSIZE)
return -1; return -1;
#define NET_DATA_IS_READY_CAN_RETURN_MINUS_ONE #define NET_DATA_IS_READY_CAN_RETURN_MINUS_ONE
#endif #endif
FD_ZERO(&sfds); FD_ZERO(&sfds);