Cleanups to recent patches

Fix packet error when using wrong GRANT command


include/config-win.h:
  Changed back to test for HAVE_SETFILEPOINTER instead of operating system
mysql-test/r/grant.result:
  Extra test to catch wrong packet bug
mysql-test/t/grant.test:
  Extra test to catch wrong packet bug
mysys/my_chsize.c:
  Cleanup
sql/opt_range.cc:
  Fix to recent BETWEEN patch
sql/sql_acl.cc:
  Fix packet error when using wrong GRANT command
sql/sql_select.cc:
  Cleanups
  Added not critical out-of-memory check

1 files changed, 56 insertions, 71 deletions

diff --git a/mysys/my_chsize.c b/mysys/my_chsize.c
index e8c3c056029..11187cf4522 100644
--- a/mysys/my_chsize.c
+++ b/mysys/my_chsize.c
@@ -30,7 +30,7 @@
       MyFlags		Flags
 
   DESCRIPTION
-    my_chsize() truncates file if shorter, else fill with the filler character
+    my_chsize() truncates file if shorter else fill with the filler character
 
   RETURN VALUE
     0	Ok
@@ -38,89 +38,74 @@
 */
 int my_chsize(File fd, my_off_t newlength, int filler, myf MyFlags)
 {
+  my_off_t oldsize;
+  char buff[IO_SIZE];
   DBUG_ENTER("my_chsize");
   DBUG_PRINT("my",("fd: %d  length: %lu  MyFlags: %d",fd,(ulong) newlength,
 		   MyFlags));
-  /* if file is shorter, expand with null, else fill unused part with null */
-  {
-    my_off_t oldsize;
-    char buff[IO_SIZE];
 
-    oldsize = my_seek(fd, 0L, MY_SEEK_END, MYF(MY_WME+MY_FAE));
-    DBUG_PRINT("info",("old_size: %ld", (ulong) oldsize));
+  oldsize = my_seek(fd, 0L, MY_SEEK_END, MYF(MY_WME+MY_FAE));
+  DBUG_PRINT("info",("old_size: %ld", (ulong) oldsize));
 
-#ifdef __WIN__
-    if (oldsize > newlength)
-    {
-      LARGE_INTEGER new_length;
-      HANDLE win_file;      
-      win_file= (HANDLE)_get_osfhandle(fd);
-      new_length.QuadPart = newlength;
-      if (SetFilePointerEx(win_file,new_length,NULL,FILE_BEGIN))
-      {
-        if (SetEndOfFile(win_file))
-          DBUG_RETURN(0);   
-      } 
-      DBUG_PRINT("error",("errno: %d",errno));
-      my_errno=errno;
-      if (MyFlags & MY_WME)
-        my_error(EE_CANT_CHSIZE,MYF(ME_BELL+ME_WAITTANG),errno);
-      DBUG_RETURN(1);
-    }
-#elif defined(HAVE_CHSIZE)
-    if (oldsize > newlength || filler == 0)
+  if (oldsize > newlength)
+#if defined(HAVE_SETFILEPOINTER)
+  /* This is for the moment only true on windows */
+  {
+    LARGE_INTEGER new_length;
+    HANDLE win_file= (HANDLE) _get_osfhandle(fd);
+    new_length.QuadPart = newlength;
+    if (SetFilePointerEx(win_file,new_length,NULL,FILE_BEGIN))
     {
-      if (chsize(fd,(off_t) newlength))
-      {
-        DBUG_PRINT("error",("errno: %d",errno));
-        my_errno=errno;
-        if (MyFlags & MY_WME)
-          my_error(EE_CANT_CHSIZE,MYF(ME_BELL+ME_WAITTANG),errno);
-        DBUG_RETURN(1);
-      }
-      else
-      {
-        if (filler == 0)
-          DBUG_RETURN(0);
-      }
+      if (SetEndOfFile(win_file))
+	DBUG_RETURN(0);
     }
+    my_errno= errno;
+    goto err;
+  }
 #elif defined(HAVE_FTRUNCATE)
-    if (oldsize > newlength)
+  {
+    if (ftruncate(fd, (off_t) newlength))
     {
-      if (ftruncate(fd, (off_t) newlength))
-      {
-	my_errno=errno;
-	DBUG_PRINT("error",("errno: %d",errno));
-	if (MyFlags & MY_WME)
-	  my_error(EE_CANT_CHSIZE, MYF(ME_BELL+ME_WAITTANG), errno);
-	DBUG_RETURN(1);
-      }
-      DBUG_RETURN(0);
-    }
-#else
-    if (oldsize > newlength)
-    {				/* Fill diff with null */
-      VOID(my_seek(fd, newlength, MY_SEEK_SET, MYF(MY_WME+MY_FAE)));
-      swap(my_off_t, newlength, oldsize);
+      my_errno= errno;
+      goto err;
     }
-#endif
-    /* Full file with 0 until it's as big as requested */
-    bfill(buff, IO_SIZE, filler);
-    while (newlength-oldsize > IO_SIZE)
+    DBUG_RETURN(0);
+  }
+#elif defined(HAVE_CHSIZE)
+  {
+    if (chsize(fd, (off_t) newlength))
     {
-      if (my_write(fd,(byte*) buff,IO_SIZE,MYF(MY_NABP)))
-	goto err;
-      oldsize+= IO_SIZE;
-    }
-    if (my_write(fd,(byte*) buff,(uint) (newlength-oldsize),MYF(MY_NABP)))
+      my_errno=errno;
       goto err;
+    }
     DBUG_RETURN(0);
-  err:
-    if (MyFlags & MY_WME)
-      my_error(EE_CANT_CHSIZE,MYF(ME_BELL+ME_WAITTANG),my_errno);
-    DBUG_PRINT("error",("errno: %d",my_errno));
-    DBUG_RETURN(1);
   }
-} /* my_chsize */
+#else
+  {
+    /*
+      Fill space between requested length and true length with 'filler'
+      We should never come here on any modern machine
+    */
+    VOID(my_seek(fd, newlength, MY_SEEK_SET, MYF(MY_WME+MY_FAE)));
+    swap(my_off_t, newlength, oldsize);
+  }
+#endif
 
+  /* Full file with 'filler' until it's as big as requested */
+  bfill(buff, IO_SIZE, filler);
+  while (newlength-oldsize > IO_SIZE)
+  {
+    if (my_write(fd,(byte*) buff,IO_SIZE,MYF(MY_NABP)))
+      goto err;
+    oldsize+= IO_SIZE;
+  }
+  if (my_write(fd,(byte*) buff,(uint) (newlength-oldsize),MYF(MY_NABP)))
+    goto err;
+  DBUG_RETURN(0);
 
+err:
+  DBUG_PRINT("error", ("errno: %d", errno));
+  if (MyFlags & MY_WME)
+    my_error(EE_CANT_CHSIZE, MYF(ME_BELL+ME_WAITTANG), my_errno);
+  DBUG_RETURN(1);
+} /* my_chsize */