bk commit into 4.1 tree (reggie:1.2289) BUG#9148

[reggie]

Below is the list of changes that have just been committed into a local
4.1 repository of reggie. When reggie 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.2289 05/05/23 14:48:25 reggie@mdk10.(none) +5 -0
  BUG# 9148 Denial of service
  
  fixups of test case and comment formatting

  mysys/my_open.c
    1.20 05/05/23 14:48:14 reggie@mdk10.(none) +4 -3
    reformatted comments

  mysys/my_fopen.c
    1.11 05/05/23 14:48:14 reggie@mdk10.(none) +3 -2
    reformatted comments

  mysql-test/t/lowercase_table.test
    1.17 05/05/23 14:48:14 reggie@mdk10.(none) +11 -0
    added my test for bug #9148 to this test case

  mysql-test/r/lowercase_table.result
    1.15 05/05/23 14:48:13 reggie@mdk10.(none) +6 -0
    added my test for bug #9148 to this test case

  BitKeeper/deleted/.del-reserved_win_names-master.opt~e56da049a7ce9a5b
    1.2 05/05/23 14:32:19 reggie@mdk10.(none) +0 -0
    Delete: mysql-test/t/reserved_win_names-master.opt

# 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:	reggie
# Host:	mdk10.(none)
# Root:	/home/reggie/bk/bug9148

--- 1.10/mysys/my_fopen.c	2005-05-21 12:31:45 -05:00
+++ 1.11/mysys/my_fopen.c	2005-05-23 14:48:14 -05:00
@@ -34,8 +34,9 @@
   DBUG_PRINT("my",("Name: '%s'  Flags: %d  MyFlags: %d",
 		   FileName, Flags, MyFlags));
   /* 
-   * 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 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 
   */
 #ifdef __WIN__
   if (! (Flags & O_CREAT) && my_access(FileName, F_OK))

--- 1.19/mysys/my_open.c	2005-05-21 12:31:45 -05:00
+++ 1.20/mysys/my_open.c	2005-05-23 14:48:14 -05:00
@@ -46,9 +46,10 @@
   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 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;

--- 1.14/mysql-test/r/lowercase_table.result	2005-04-28 17:30:40 -05:00
+++ 1.15/mysql-test/r/lowercase_table.result	2005-05-23 14:48:13 -05:00
@@ -83,3 +83,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.16/mysql-test/t/lowercase_table.test	2005-04-28 17:30:40 -05:00
+++ 1.17/mysql-test/t/lowercase_table.test	2005-05-23 14:48:14 -05:00
@@ -82,3 +82,14 @@
 drop table t1, t2;
 
 show tables;
+
+#
+#Bug 9148: Denial of service
+#
+--error 1049
+use lpt1;
+--error 1049
+use com1;
+--error 1049
+use prn;
+