bk commit into 5.0 tree (gbichot:1.1903)

[guilhem]

Below is the list of changes that have just been committed into a local
5.0 repository of gbichot. When gbichot does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1903 05/05/24 00:31:28 gbichot@stripped +5 -0
  Merge bk-internal.mysql.com:/data0/bk/mysql-4.1
  into bk-internal.mysql.com:/data0/bk/mysql-5.0

  mysys/my_open.c
    1.20 05/05/24 00:31:26 gbichot@stripped +0 -0
    Auto merged

  mysql-test/t/lowercase_table.test
    1.18 05/05/24 00:31:26 gbichot@stripped +0 -0
    Auto merged

  mysql-test/r/lowercase_table.result
    1.16 05/05/24 00:31:26 gbichot@stripped +1 -1
    Auto merged

  BitKeeper/etc/logging_ok
    1.317 05/05/24 00:31:13 gbichot@stripped +0 -0
    auto-union

  BitKeeper/etc/gone
    1.106 05/05/24 00:31:12 gbichot@stripped +12 -0
    auto-union

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	gbichot
# Host:	bk-internal.mysql.com
# Root:	/data0/bk/mysql-5.0/RESYNC

--- 1.19/mysys/my_open.c	2005-01-11 00:14:39 +01:00
+++ 1.20/mysys/my_open.c	2005-05-24 00:31:26 +02:00
@@ -46,6 +46,13 @@
   DBUG_PRINT("my",("Name: '%s'  Flags: %d  MyFlags: %d",
 		   FileName, Flags, MyFlags));
 #if defined(MSDOS) || defined(__WIN__) || defined(__EMX__) || defined(OS2)
+  /* 
+    if we are not creating, then we need to use my_access to make 
+    sure  the file exists since Windows doesn't handle files like 
+    "com1.sym" very  well 
+  */  
+  if (! (Flags & O_CREAT) && my_access(FileName, F_OK))    
+	  return -1;
   if (Flags & O_SHARE)
     fd = sopen((my_string) FileName, (Flags & ~O_SHARE) | O_BINARY, SH_DENYNO,
 	       MY_S_IREAD | MY_S_IWRITE);

--- 1.316/BitKeeper/etc/logging_ok	2005-05-18 20:02:02 +02:00
+++ 1.317/BitKeeper/etc/logging_ok	2005-05-24 00:31:13 +02:00
@@ -54,6 +54,7 @@
 ejonore@stripped
 evgen@moonbone.(none)
 evgen@stripped
+gbichot@stripped
 gbichot@stripped
 gbichot@stripped
 gbichot@stripped

--- 1.15/mysql-test/r/lowercase_table.result	2005-05-02 19:01:30 +02:00
+++ 1.16/mysql-test/r/lowercase_table.result	2005-05-24 00:31:26 +02:00
@@ -84,3 +84,9 @@
 drop table t1, t2;
 show tables;
 Tables_in_test
+use lpt1;
+ERROR 42000: Unknown database 'lpt1'
+use com1;
+ERROR 42000: Unknown database 'com1'
+use prn;
+ERROR 42000: Unknown database 'prn'

--- 1.17/mysql-test/t/lowercase_table.test	2005-05-02 19:19:33 +02:00
+++ 1.18/mysql-test/t/lowercase_table.test	2005-05-24 00:31:26 +02:00
@@ -83,3 +83,14 @@
 drop table t1, t2;
 
 show tables;
+
+#
+#Bug 9148: Denial of service
+#
+--error 1049
+use lpt1;
+--error 1049
+use com1;
+--error 1049
+use prn;
+

--- 1.105/BitKeeper/etc/gone	2005-03-16 22:59:37 +01:00
+++ 1.106/BitKeeper/etc/gone	2005-05-24 00:31:12 +02:00
@@ -1187,20 +1187,32 @@
 ndb/src/client/Makefile
 nick@stripped|mysql-test/r/rpl_empty_master_crash.result|20020531235552|47718|615f521be2132141
 nick@stripped|mysql-test/t/rpl_empty_master_crash.test|20020531235552|52328|99464e737639ccc6
+reggie@mdk10.(none)|mysql-test/t/reserved_win_names-master.opt|20050520210356|14878|e56da049a7ce9a5b
 sasha@stripped|BitKeeper/etc/logging_ok|20000801000905|12967|5b7d847a2158554
 sasha@stripped|build-tags|20011125054855|05181|7afb7e785b80f97
 sasha@stripped|build-tags|20011201050944|25384|b6f6fff142121618
 sasha@stripped|libmysql_r/acconfig.h|20001128060846|51084|65f1202b3b5c345f
 sasha@stripped|mysql-test/README.gcov|20001012045950|28177|5a6da067a30780ce
+sasha@stripped|mysql-test/README.gcov|20001214012355|41825|2de7575ca81155e5
 sasha@stripped|mysql-test/README|20001010001022|12739|108667adaeabe3f5
 sasha@stripped|mysql-test/r/3.23/alt000001.result|20001122072330|24729|393103dbf15f35c9
 sasha@stripped|mysql-test/r/3.23/ins000001.result|20001018175743|49824|f45c599efdf8352b
 sasha@stripped|mysql-test/r/3.23/rpl000001.a.result|20001118063528|39426|2987b17db06808c3
 sasha@stripped|mysql-test/r/3.23/rpl000001.b.result|20001118063528|44057|62e1fa91167cacc3
+sasha@stripped|mysql-test/r/3.23/rpl000002.result|20001118063528|46039|109f5ceed1e0d64
 sasha@stripped|mysql-test/r/3.23/rpl000003.result|20001118063528|48148|68d6ee00beaa011
 sasha@stripped|mysql-test/r/3.23/rpl000004.a.result|20001118063528|50132|3415f066cb91c460
 sasha@stripped|mysql-test/r/3.23/rpl000004.b.result|20001118063528|52094|352b35351551485
+sasha@stripped|mysql-test/r/3.23/rpl000005.result|20001118063528|54071|a50962bc2340ab9a
+sasha@stripped|mysql-test/r/3.23/rpl000006.result|20001118063528|56081|5653051e8ce6b4aa
+sasha@stripped|mysql-test/r/3.23/rpl000007.result|20001121063807|21606|e0c3b6134e0884da
+sasha@stripped|mysql-test/r/3.23/rpl000008.result|20001121063807|23636|c5cfee19ca5a7da9
+sasha@stripped|mysql-test/r/3.23/rpl000009.result|20001121063807|25633|ed8042446ab97926
+sasha@stripped|mysql-test/r/3.23/rpl000010.result|20001122072330|29430|3228109b8965b0f8
+sasha@stripped|mysql-test/r/3.23/rpl000011.result|20001125024912|48851|c29dce30aa97f265
+sasha@stripped|mysql-test/r/3.23/rpl000012.result|20001126062901|05938|35d6596da7b90fc5
 sasha@stripped|mysql-test/r/3.23/rpl000012.status.result|20001126062901|09395|bbbd650b5beea32f
+sasha@stripped|mysql-test/r/3.23/rpl000013.result|20001202171150|03876|ac5024e6cf6daac6
 sasha@stripped|mysql-test/r/3.23/rpl000013.status.result|20001202171150|06069|6bee190c298cc9fd
 sasha@stripped|mysql-test/r/3.23/sel000003.result|20001011230020|64653|d7b657b1e3a286a7
 sasha@stripped|mysql-test/r/3.23/sel000100.res|20001205131218|23520|84ed46856cb3a69f
@@ -1209,6 +1221,7 @@
 sasha@stripped|mysql-test/r/df_crash.result|20010406010433|59989|4a3dbee64843953d
 sasha@stripped|mysql-test/r/identity.result|20010910233028|16331|e41453a364242503
 sasha@stripped|mysql-test/r/mrg000002.result|20001212152450|11492|745be0854aaaaf5e
+sasha@stripped|mysql-test/r/slave-running.result|20001208141122|24303|f73e49462cf59e1f
 sasha@stripped|mysql-test/r/slave-stopped.result|20001208141122|28916|25c134b1a4f1993a
 sasha@stripped|mysql-test/std_data/m.MRG|20001212152450|17736|3f5632c37af00f18
 sasha@stripped|mysql-test/std_data/m.frm|20001212152450|13897|e351dfe0b6824c0c