From c32f62bebb609f6a0c2c91c303c15a482a5b28d3 Mon Sep 17 00:00:00 2001
From: "holyfoot/hf@mysql.com/deer.(none)" <>
Date: Mon, 4 Sep 2006 19:47:24 +0500
Subject: 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 | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'myisam/mi_check.c')

diff --git a/myisam/mi_check.c b/myisam/mi_check.c
index 1e62e5e641d..65ce70a97df 100644
--- a/myisam/mi_check.c
+++ b/myisam/mi_check.c
@@ -1366,7 +1366,8 @@ int mi_repair(MI_CHECK *param, register MI_INFO *info,
 			   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 @@ int mi_repair_by_sort(MI_CHECK *param, register MI_INFO *info,
 			   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 @@ int mi_repair_parallel(MI_CHECK *param, register MI_INFO *info,
 			   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)
-- 
cgit v1.2.1


From 668a57b10a2556f1d90de54b71cc379b536ca965 Mon Sep 17 00:00:00 2001
From: "holyfoot/hf@mysql.com/deer.(none)" <>
Date: Wed, 6 Sep 2006 19:56:19 +0500
Subject: bug #12991 (compile error --without-geometry)

---
 myisam/mi_check.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'myisam/mi_check.c')

diff --git a/myisam/mi_check.c b/myisam/mi_check.c
index 1e62e5e641d..1374cb05094 100644
--- a/myisam/mi_check.c
+++ b/myisam/mi_check.c
@@ -1153,9 +1153,12 @@ int chk_data_link(MI_CHECK *param, MI_INFO *info,int extend)
 	      /* We don't need to lock the key tree here as we don't allow
 		 concurrent threads when running myisamchk
 	      */
-              int search_result= (keyinfo->flag & HA_SPATIAL) ?
+              int search_result=
+#ifdef HAVE_RTREE_KEYS
+                (keyinfo->flag & HA_SPATIAL) ?
                 rtree_find_first(info, key, info->lastkey, key_length,
                                  MBR_EQUAL | MBR_DATA) : 
+#endif
                 _mi_search(info,keyinfo,info->lastkey,key_length,
                            SEARCH_SAME, info->s->state.key_root[key]);
               if (search_result)
-- 
cgit v1.2.1