From: Date: August 25 2005 3:06am
Subject: bk commit into 4.1 tree (jimw:1.2389) BUG#12325
List-Archive: http://lists.mysql.com/internals/28792
X-Bug: 12325
Message-Id: <20050825010632.29464A82E9@rama.trainedmonkey.com>

Below is the list of changes that have just been committed into a local
4.1 repository of jimw. When jimw 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.2389 05/08/24 18:06:27 jimw@stripped +1 -0
  Fix handling of filenames that start the same as reserved filenames
  on Windows. (Bug #12325)

  mysys/my_access.c
    1.6 05/08/24 18:06:23 jimw@stripped +1 -1
    Check that we've matched the whole forbidden name.

# 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:	jimw
# Host:	rama.(none)
# Root:	/home/jimw/my/mysql-4.1-12325

--- 1.5/mysys/my_access.c	2005-06-27 06:46:33 -07:00
+++ 1.6/mysys/my_access.c	2005-08-24 18:06:23 -07:00
@@ -105,7 +105,7 @@
     {
       if (*reserved != my_toupper(&my_charset_latin1, *name))
         break;
-      if (++name == end)
+      if (++name == end && !reserved[1])
         DBUG_RETURN(1);                         /* Found wrong path */
     } while (*++reserved);
   }