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

3 files changed, 4 insertions, 3 deletions

diff --git a/mysql-test/r/grant2.result b/mysql-test/r/grant2.result
index fd3eca56b31..6c6e0f19e08 100644
--- a/mysql-test/r/grant2.result
+++ b/mysql-test/r/grant2.result
@@ -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;
diff --git a/mysql-test/t/grant2.test b/mysql-test/t/grant2.test
index 39ac0b0d105..ce1d0fb2271 100644
--- a/mysql-test/t/grant2.test
+++ b/mysql-test/t/grant2.test
@@ -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
diff --git a/scripts/make_win_src_distribution.sh b/scripts/make_win_src_distribution.sh
index 893ae6c188a..22c0ea7c839 100644
--- a/scripts/make_win_src_distribution.sh
+++ b/scripts/make_win_src_distribution.sh
@@ -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