Commit 584524d1 authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.1-new 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/grant2.result:
  Auto merged
mysql-test/t/grant2.test:
  Auto merged
sql/sql_acl.cc:
  Auto merged
parents cb46f3a3 e4bec46e

mysql-test/r/grant2.result

+1 −1
Original line number Diff line number Diff line
@@ -348,7 +348,7 @@ INSERT INTO mysql.db (host, db, user, select_priv) VALUES 
('%','TESTDB','mysqltest_1','Y');

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;

mysql-test/t/grant2.test

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

scripts/make_win_src_distribution.sh

+1 −1
Original line number Diff line number Diff line
@@ -249,7 +249,7 @@ copy_dir_dirs() { 
# Input directories to be copied

#



for i in client dbug extra storage/heap include storage/archive storage/example \

for i in client dbug extra storage/heap include storage/archive storage/csv \

         include/mysql libmysql libmysqld storage/myisam storage/example \

         storage/myisammrg mysys regex sql strings sql-common sql/examples \

         tools vio zlib