bk commit into 4.1 tree (holyfoot:1.2563) BUG#12620

[holyfoot]

Below is the list of changes that have just been committed into a local
4.1 repository of hf. When hf 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@stripped, 2006-09-04 19:47:24+05:00, holyfoot@stripped +2 -0
  bug #12620 (UTF-8 indexing causes ER_NO_KEYFILE error)
  
  The problem is that on some Mac OS X-es the file writing/reading
  call with zero bytes to read/write returns error.
  So here i try to eliminate that kinds of calls.

  myisam/mi_check.c@stripped, 2006-09-04 19:47:21+05:00, holyfoot@stripped +6 -3
    zero length copying avoided

  mysys/my_chsize.c@stripped, 2006-09-04 19:47:21+05:00, holyfoot@stripped +3 -1
    no file operations if it's not necessary

# 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:	holyfoot
# Host:	deer.(none)
# Root:	/home/hf/work/mysql-4.1.15428

--- 1.158/myisam/mi_check.c	2006-09-04 19:47:29 +05:00
+++ 1.159/myisam/mi_check.c	2006-09-04 19:47:29 +05:00
@@ -1366,7 +1366,8 @@
 			   param->temp_filename);
       goto err;
     }
-    if (filecopy(param,new_file,info->dfile,0L,new_header_length,
+    if (new_header_length &&
+        filecopy(param,new_file,info->dfile,0L,new_header_length,
 		 "datafile-header"))
       goto err;
     info->s->state.dellink= HA_OFFSET_ERROR;
@@ -2063,7 +2064,8 @@
 			   param->temp_filename);
       goto err;
     }
-    if (filecopy(param, new_file,info->dfile,0L,new_header_length,
+    if (new_header_length &&
+        filecopy(param, new_file,info->dfile,0L,new_header_length,
 		 "datafile-header"))
       goto err;
     if (param->testflag & T_UNPACK)
@@ -2431,7 +2433,8 @@
 			   param->temp_filename);
       goto err;
     }
-    if (filecopy(param, new_file,info->dfile,0L,new_header_length,
+    if (new_header_length &&
+        filecopy(param, new_file,info->dfile,0L,new_header_length,
 		 "datafile-header"))
       goto err;
     if (param->testflag & T_UNPACK)

--- 1.15/mysys/my_chsize.c	2006-09-04 19:47:29 +05:00
+++ 1.16/mysys/my_chsize.c	2006-09-04 19:47:29 +05:00
@@ -44,7 +44,9 @@
   DBUG_PRINT("my",("fd: %d  length: %lu  MyFlags: %d",fd,(ulong) newlength,
 		   MyFlags));
 
-  oldsize = my_seek(fd, 0L, MY_SEEK_END, MYF(MY_WME+MY_FAE));
+  if ((oldsize = my_seek(fd, 0L, MY_SEEK_END, MYF(MY_WME+MY_FAE))) == newlength)
+    DBUG_RETURN(0);
+
   DBUG_PRINT("info",("old_size: %ld", (ulong) oldsize));
 
   if (oldsize > newlength)