Commit ba3b8fd8 authored by unknown's avatar unknown
Browse files

Merge msvensson@devsrv-b.mysql.com:/space/magnus/bug17279/my50-bug17279/ 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
parents f56e8734 79fbd665

mysql-test/r/grant2.result

+22 −0
Original line number Diff line number Diff line
@@ -334,3 +334,25 @@ lock table mysql.user write; 
 revoke all on *.* from 'mysqltest_1'@'localhost';

unlock tables;

drop user 'mysqltest_1'@'localhost';

create database TESTDB;

create table t2(a int);

create temporary table t1 as select * from mysql.user;

delete from mysql.user where host='localhost';

INSERT INTO mysql.user VALUES

('%','mysqltest_1',password('password'),'N','N','N','N','N','N',

'N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N',

'','','','',0,0,0,0);

INSERT INTO mysql.db VALUES

('%','TESTDB','mysqltest_1','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','N','Y','Y','Y','

Y','N');

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'

delete from mysql.user;

delete from mysql.db where host='%' and user='mysqltest_1' and db='TESTDB';

insert into mysql.user select * from t1;

drop table t1, t2;

drop database TESTDB;

flush privileges;

mysql-test/t/grant2.test

+35 −0
Original line number Diff line number Diff line
@@ -429,3 +429,38 @@ disconnect con2root; 
disconnect con3root;



# End of 4.1 tests



#

# Bug#17279 user with no global privs and with create

#           priv in db can create databases

#



create database TESTDB;

create table t2(a int);

create temporary table t1 as select * from mysql.user;

delete from mysql.user where host='localhost';

INSERT INTO mysql.user VALUES

('%','mysqltest_1',password('password'),'N','N','N','N','N','N',

'N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N',

'','','','',0,0,0,0);

INSERT INTO mysql.db VALUES

('%','TESTDB','mysqltest_1','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','N','Y','Y','Y','

Y','N');

FLUSH PRIVILEGES;



connect (con1,localhost,mysqltest_1,password,TESTDB);



# The user mysqltest_1 should only be allowed access to

# database TESTDB, not TEStdb

--error 1044

create database TEStdb;



# Clean-up

connection default;

delete from mysql.user;

delete from mysql.db where host='%' and user='mysqltest_1' and db='TESTDB';

insert into mysql.user select * from t1;

drop table t1, t2;

drop database TESTDB;

flush privileges;

sql/sql_acl.cc

+3 −1
Original line number Diff line number Diff line
@@ -148,7 +148,9 @@ my_bool acl_init(bool dont_read_acl_tables) 


  acl_cache= new hash_filo(ACL_CACHE_SIZE, 0, 0,

                           (hash_get_key) acl_entry_get_key,

                           (hash_free_key) free, system_charset_info);

                           (hash_free_key) free,

                           /* Use the case sensitive "binary" charset */

                           &my_charset_bin);

  if (dont_read_acl_tables)

  {

    DBUG_RETURN(0); /* purecov: tested */