Commit 28729caa authored by unknown's avatar unknown
Browse files

Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 

into  mysql.com:/usr/home/bar/mysql-4.1.b17647


sql/sql_acl.cc:
  Auto merged
parents 4cb0659d af2f9b90

mysql-test/include/have_case_sensitive_file_system.inc

0 → 100644
+4 −0
Original line number Diff line number Diff line 
--require r/case_sensitive_file_system.require

--disable_query_log

show variables like "lower_case_file_system";

--enable_query_log

mysql-test/r/case_sensitive_file_system.require

0 → 100644
+2 −0
Original line number Diff line number Diff line 
Variable_name	Value

lower_case_file_system	OFF

mysql-test/r/lowercase_fs_off.result

0 → 100644
+11 −0
Original line number Diff line number Diff line 
create database d1;

grant all on d1.* to 'sample'@'localhost' identified by 'password';

flush privileges;

select database();

database()

d1

create database d2;

ERROR 42000: Access denied for user 'sample'@'localhost' to database 'd2'

create database D1;

ERROR 42000: Access denied for user 'sample'@'localhost' to database 'D1'

drop database if exists d1;

mysql-test/t/lowercase_fs_off.test

0 → 100644
+27 −0
Original line number Diff line number Diff line 
#

# Specific tests for case sensitive file systems

# i.e. lower_case_filesystem=OFF

#

-- source include/have_case_sensitive_file_system.inc



connect (master,localhost,root,,);

connection master;

create database d1;

grant all on d1.* to 'sample'@'localhost' identified by 'password';

flush privileges;



connect (sample,localhost,sample,password,d1);

connection sample;

select database();

--error 1044

create database d2;

--error 1044

create database D1;

disconnect sample;



connection master;

drop database if exists d1;

disconnect master;

connection default;



# End of 4.1 tests

sql/sql_acl.cc

+3 −1
Original line number Diff line number Diff line
@@ -146,7 +146,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,

                           lower_case_file_system ?

                           system_charset_info : &my_charset_bin);

  if (dont_read_acl_tables)

  {

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