Merge bk-internal.mysql.com:/home/bk/mysql-4.1

into mysql.com:/home/my/mysql-4.1

include/my_sys.h

@@ -578,6 +578,7 @@ extern int my_access(const char *path, int amode);
 #else
 #define my_access access
 #endif
+extern int check_if_legal_filename(const char *path);
 
 #ifndef TERMINATE
 extern void TERMINATE(FILE *file);

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 */

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)

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);

sql/sql_lex.cc

@@ -420,7 +420,7 @@ static const uint signed_longlong_len=19;
 static const char *unsigned_longlong_str="18446744073709551615";
 static const uint unsigned_longlong_len=20;
 
-inline static uint int_token(const char *str,uint length)
+static inline uint int_token(const char *str,uint length)
 {
   if (length < long_len)			// quick normal case
     return NUM;

sql/sql_parse.cc

@@ -2823,8 +2823,8 @@ unsent_create_error:
       
     TABLE *table= tables->table;
     /* Skip first table, which is the table we are inserting in */
-    lex->select_lex.table_list.first= (byte*) first_local_table->next;
-    tables= (TABLE_LIST *) lex->select_lex.table_list.first;
+    select_lex->table_list.first= (byte*) first_local_table->next;
+    tables= (TABLE_LIST *) select_lex->table_list.first;
     first_local_table->next= 0;
     
     if (!(res= mysql_prepare_insert(thd, tables, first_local_table, 
@@ -5394,6 +5394,7 @@ int multi_update_precheck(THD *thd, TABLE_LIST *tables)
     1   error (message is sent to user)
     -1  error (message is not sent to user)
 */
+
 int multi_delete_precheck(THD *thd, TABLE_LIST *tables, uint *table_count)
 {
   DBUG_ENTER("multi_delete_precheck");

sql/sql_repl.cc

@@ -152,7 +152,8 @@ File open_binlog(IO_CACHE *log, const char *log_file_name,
   File file;
   DBUG_ENTER("open_binlog");
 
-  if ((file = my_open(log_file_name, O_RDONLY | O_BINARY, MYF(MY_WME))) < 0)
+  if ((file = my_open(log_file_name, O_RDONLY | O_BINARY | O_SHARE,
+                      MYF(MY_WME))) < 0)
   {
     sql_print_error("Failed to open log (\
 file '%s', errno %d)", log_file_name, my_errno);
@@ -1338,13 +1339,11 @@ int show_binlogs(THD* thd)
 {
   IO_CACHE *index_file;
   LOG_INFO cur;
-  IO_CACHE log;
   File file;
-  const char *errmsg= 0;
-  MY_STAT stat_area;
   char fname[FN_REFLEN];
   List<Item> field_list;
   uint length;
+  int cur_dir_len;
   Protocol *protocol= thd->protocol;
   DBUG_ENTER("show_binlogs");
 
@@ -1364,34 +1363,35 @@ int show_binlogs(THD* thd)
   index_file=mysql_bin_log.get_index_file();
 
   mysql_bin_log.get_current_log(&cur);
-  int cur_dir_len = dirname_length(cur.log_file_name);
+  cur_dir_len= dirname_length(cur.log_file_name);
 
   reinit_io_cache(index_file, READ_CACHE, (my_off_t) 0, 0, 0);
 
   /* The file ends with EOF or empty line */
   while ((length=my_b_gets(index_file, fname, sizeof(fname))) > 1)
   {
-    fname[--length] = '\0';  /* remove the newline */
+    int dir_len;
+    ulonglong file_length= 0;                   // Length if open fails
+    fname[--length] = '\0';                     // remove the newline
 
     protocol->prepare_for_resend();
-    int dir_len = dirname_length(fname);
-    protocol->store(fname + dir_len, length-dir_len, &my_charset_bin);
-    if(!(strncmp(fname+dir_len, cur.log_file_name+cur_dir_len, length-dir_len)))
+    dir_len= dirname_length(fname);
+    length-= dir_len;
+    protocol->store(fname + dir_len, length, &my_charset_bin);
+
+    if (!(strncmp(fname+dir_len, cur.log_file_name+cur_dir_len, length)))
+      file_length= cur.pos;  /* The active log, use the active position */
+    else
     {
-      /* this is the active log, use the active position */
-      protocol->store((ulonglong) cur.pos);
-    } else {
       /* this is an old log, open it and find the size */
-      if ((file=open_binlog(&log, fname+dir_len, &errmsg)) >= 0)
+      if ((file= my_open(fname+dir_len, O_RDONLY | O_SHARE | O_BINARY,
+                         MYF(0))) >= 0)
       {
-        protocol->store((ulonglong) my_b_filelength(&log));
-        end_io_cache(&log);
+        file_length= (ulonglong) my_seek(file, 0L, MY_SEEK_END, MYF(0));
         my_close(file, MYF(0));
-      } else {
-        /* the file wasn't openable, but 0 is an invalid value anyway */
-        protocol->store((ulonglong) 0);
       }
     }
+    protocol->store(file_length);
     if (protocol->write())
       goto err;
   }