Merge from 4.1

BitKeeper/deleted/.del-ha_isam.cc~4dce65904db2675e:
  Auto merged
BitKeeper/deleted/.del-ha_isammrg.cc~dc682e4755d77a2e:
  Auto merged
client/sql_string.cc:
  Auto merged
client/sql_string.h:
  Auto merged
include/my_global.h:
  Auto merged
include/my_sys.h:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysys/my_open.c:
  Auto merged
mysys/raid.cc:
  Auto merged
ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_blackhole.cc:
  Auto merged
sql/ha_heap.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_geofunc.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/item_uniq.cc:
  Auto merged
sql/item_uniq.h:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/procedure.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/protocol_cursor.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_analyse.cc:
  Auto merged
sql/sql_analyse.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_map.cc:
  Auto merged
sql/sql_olap.cc:
  Auto merged
sql/sql_string.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged
sql/tztime.cc:
  Auto merged
sql/opt_range.cc:
  Manual merge
sql/sql_parse.cc:
  Use select_lex pointer instead of lex->select_lex
sql/sql_repl.cc:
  Function moved to log.cc, fix made there instead
sql/sql_class.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

4 files changed, 110 insertions, 36 deletions

diff --git a/mysys/my_access.c b/mysys/my_access.c
index 6a8887e42a6..28210bdfc7d 100644
--- a/mysys/my_access.c
+++ b/mysys/my_access.c
@@ -15,39 +15,107 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #include "mysys_priv.h"
+#include <m_string.h>
 
 #ifdef __WIN__
 
 /*
- * Check a file or path for accessability.
- *
- * SYNOPSIS
- * 	file_access()
- * 	pathpath to check
- * 	amodemode to check
- *
- * 	DESCRIPTION
- * 	This function wraps the normal access method because the access 
- * 	available in MSVCRT> +reports that filenames such as LPT1 and 
- * 	COM1 are valid (they are but should not be so for us).
- *
- * 	RETURN VALUES
- * 	0     ok
- * 	-1    error
- */
+  Check a file or path for accessability.
+ 
+  SYNOPSIS
+    file_access()
+    path 	Path to file
+    amode	Access method
+ 
+  DESCRIPTION
+    This function wraps the normal access method because the access 
+    available in MSVCRT> +reports that filenames such as LPT1 and 
+    COM1 are valid (they are but should not be so for us).
+ 
+  RETURN VALUES
+  0    ok
+  -1   error  (We use -1 as my_access is mapped to access on other platforms)
+*/
+
 int my_access(const char *path, int amode) 
 { 
-	WIN32_FILE_ATTRIBUTE_DATA fileinfo;
-	BOOL result;
+  WIN32_FILE_ATTRIBUTE_DATA fileinfo;
+  BOOL result;
 	
-	result = GetFileAttributesEx(path, GetFileExInfoStandard, 
-			&fileinfo);
-	if (! result) 
-		return -1;
-	if ((fileinfo.dwFileAttributes & FILE_ATTRIBUTE_READONLY) &&
-			(amode & 2))
-		return -1;
-	return 0;
+  result= GetFileAttributesEx(path, GetFileExInfoStandard, &fileinfo);
+  if (! result ||
+      (fileinfo.dwFileAttributes & FILE_ATTRIBUTE_READONLY) && (amode & W_OK))
+  {
+    my_errno= errno= EACCES;
+    return -1;
+  }
+  return 0;
 }
 
+#endif /* __WIN__ */
+
+#if defined(MSDOS) || defined(__WIN__) || defined(__EMX__)
+
+/*
+  List of file names that causes problem on windows
+
+  NOTE that one can also not have file names of type CON.TXT
+*/
+
+static const char *reserved_names[]=
+{
+  "CON", "PRN", "AUX", "NUL", "COM1", "COM2", "COM3", "COM4", "COM5", "COM6",
+  "COM7", "COM8", "COM9", "LPT1", "LPT2", "LPT3", "LPT4", "LPT5", "LPT6",
+  "LPT7", "LPT8", "LPT9", "CLOCK$",
+  NullS
+};
+
+#define MAX_RESERVED_NAME_LENGTH 6
+
+/*
+  Check if a path will access a reserverd file name that may cause problems
+ 
+  SYNOPSIS
+    check_if_legal_filename
+    path 	Path to file
+
+  RETURN
+    0  ok
+    1  reserved file name
+*/
+
+int check_if_legal_filename(const char *path)
+{
+  const char *end;
+  const char **reserved_name;
+  DBUG_ENTER("check_if_legal_filename");
+
+  path+= dirname_length(path);                  /* To start of filename */
+  if (!(end= strchr(path, FN_EXTCHAR)))
+    end= strend(path);
+  if (path == end || (uint) (path - end) > MAX_RESERVED_NAME_LENGTH)
+    DBUG_RETURN(0);                             /* Simplify inner loop */
+
+  for (reserved_name= reserved_names; *reserved_name; reserved_name++)
+  {
+    const char *name= path;
+    while (name != end)
+    {
+      if (my_toupper(&my_charset_latin1, *path) !=
+          my_toupper(&my_charset_latin1, *name))
+        break;
+      if (name++ == end)
+        DBUG_RETURN(1);                         /* Found wrong path */
+    }
+  }
+  DBUG_RETURN(0);
+}
 #endif
+
+
+#ifdef OS2
+int check_if_legal_filename(const char *path)
+{
+  return 0;
+}
+#endif /* OS2 */
diff --git a/mysys/my_fopen.c b/mysys/my_fopen.c
index 4310250bd0d..3c6f1b15384 100644
--- a/mysys/my_fopen.c
+++ b/mysys/my_fopen.c
@@ -39,13 +39,16 @@ FILE *my_fopen(const char *FileName, int Flags, myf MyFlags)
     very  well 
   */
 #ifdef __WIN__
-  if (! (Flags & O_CREAT) && my_access(FileName, F_OK))
-	  fd=0;
+  if (check_if_legal_filename(FileName))
+  {
+    errno= EACCES;
+    fd= 0;
+  }
   else
 #endif
   {
-  	make_ftype(type,Flags);
-  	fd = fopen(FileName, type);
+    make_ftype(type,Flags);
+    fd = fopen(FileName, type);
   }
   
   if (fd != 0)
diff --git a/mysys/my_open.c b/mysys/my_open.c
index 7fc5282838f..69d63c49554 100644
--- a/mysys/my_open.c
+++ b/mysys/my_open.c
@@ -47,12 +47,15 @@ File my_open(const char *FileName, int Flags, myf MyFlags)
 		   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 
+    Check that we don't try to open or create a file name that may
+    cause problems for us in the future (like PRN)
   */  
-  if (! (Flags & O_CREAT) && my_access(FileName, F_OK))    
-	  return -1;
+  if (check_if_legal_filename(FileName))
+  {
+    errno= EACCES;
+    DBUG_RETURN(my_register_filename(-1, FileName, FILE_BY_OPEN,
+                                     EE_FILENOTFOUND, MyFlags));
+  }
   if (Flags & O_SHARE)
     fd = sopen((my_string) FileName, (Flags & ~O_SHARE) | O_BINARY, SH_DENYNO,
 	       MY_S_IREAD | MY_S_IWRITE);
diff --git a/mysys/raid.cc b/mysys/raid.cc
index 1d2e0cb01f0..29819a878c4 100644
--- a/mysys/raid.cc
+++ b/mysys/raid.cc
@@ -70,7 +70,7 @@
    tonu@mysql.com & monty@mysql.com
 */
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_IMPLEMENTATION 
 #pragma implementation				// gcc: Class implementation
 #endif