bk commit into 4.1 tree (jimw:1.2396) BUG#12325

[Jim Winstead]

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.2396 05/08/31 18:32:15 jimw@stripped +6 -0
  Fix handling of filenames that start the same as reserved filenames
  on Windows. (Bug #12325)

  mysql-test/t/windows.test
    1.1 05/08/31 18:32:13 jimw@stripped +20 -0
    New BitKeeper file ``mysql-test/t/windows.test''

  mysql-test/t/windows.test
    1.0 05/08/31 18:32:13 jimw@stripped +0 -0
    BitKeeper file /home/jimw/my/mysql-4.1-12325/mysql-test/t/windows.test

  mysql-test/r/windows.result
    1.1 05/08/31 18:32:12 jimw@stripped +8 -0
    New BitKeeper file ``mysql-test/r/windows.result''

  mysql-test/include/windows.inc
    1.1 05/08/31 18:32:12 jimw@stripped +4 -0
    New BitKeeper file ``mysql-test/include/windows.inc''

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

  mysql-test/t/lowercase_table.test
    1.19 05/08/31 18:32:12 jimw@stripped +0 -10
    Move test to new windows.test, since it is Windows-specific

  mysql-test/r/windows.result
    1.0 05/08/31 18:32:12 jimw@stripped +0 -0
    BitKeeper file /home/jimw/my/mysql-4.1-12325/mysql-test/r/windows.result

  mysql-test/r/lowercase_table.result
    1.16 05/08/31 18:32:12 jimw@stripped +0 -6
    Update results

  mysql-test/include/windows.inc
    1.0 05/08/31 18:32:12 jimw@stripped +0 -0
    BitKeeper file /home/jimw/my/mysql-4.1-12325/mysql-test/include/windows.inc

# 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
--- New file ---
+++ mysql-test/include/windows.inc	05/08/31 18:32:12
--require r/true.require
disable_query_log;
select convert(@@version_compile_os using latin1) IN ("Win32","Win64","Windows") as
"TRUE";
enable_query_log;

--- New file ---
+++ mysql-test/r/windows.result	05/08/31 18:32:12
use lpt1;
ERROR 42000: Unknown database 'lpt1'
use com1;
ERROR 42000: Unknown database 'com1'
use prn;
ERROR 42000: Unknown database 'prn'
create table nu (a int);
drop table nu;

--- New file ---
+++ mysql-test/t/windows.test	05/08/31 18:32:13
# Windows-specific tests
--source include/windows.inc

#
# Bug 9148: Denial of service
#
--error 1049
use lpt1;
--error 1049
use com1;
--error 1049
use prn;

#
# Bug #12325: Can't create table named 'nu'
#
create table nu (a int);
drop table nu;

# End of 4.1 tests


--- 1.15/mysql-test/r/lowercase_table.result	2005-05-23 12:48:13 -07:00
+++ 1.16/mysql-test/r/lowercase_table.result	2005-08-31 18:32:12 -07:00
@@ -83,9 +83,3 @@
 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.18/mysql-test/t/lowercase_table.test	2005-07-27 17:21:44 -07:00
+++ 1.19/mysql-test/t/lowercase_table.test	2005-08-31 18:32:12 -07:00
@@ -83,14 +83,4 @@
 
 show tables;
 
-#
-#Bug 9148: Denial of service
-#
---error 1049
-use lpt1;
---error 1049
-use com1;
---error 1049
-use prn;
-
 # End of 4.1 tests

--- 1.5/mysys/my_access.c	2005-06-27 06:46:33 -07:00
+++ 1.6/mysys/my_access.c	2005-08-31 18:32:12 -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);
   }