From 8cd4c2358de1581b36faa4d197508e232b1390b4 Mon Sep 17 00:00:00 2001
From: "monty@hundin.mysql.fi" <>
Date: Sat, 3 Nov 2001 15:18:09 +0200
Subject: Fix that mysqladmin shutdown can be interrupted with ^C Fixed bug
 with BLOB keys in BDB tables Fixed problem with MERGE tables on OS with 32
 bit files Fixed that TIME_TO_SEC() works with negative times

---
 sql/ha_myisammrg.cc | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'sql/ha_myisammrg.cc')

diff --git a/sql/ha_myisammrg.cc b/sql/ha_myisammrg.cc
index 1feaa4e5d66..9499c42fdc9 100644
--- a/sql/ha_myisammrg.cc
+++ b/sql/ha_myisammrg.cc
@@ -175,7 +175,11 @@ void ha_myisammrg::info(uint flag)
   mean_rec_length=info.reclength;
   block_size=0;
   update_time=0;
+#if SIZEOF_OFF_T > 4
   ref_length=6;					// Should be big enough
+#else
+  ref_length=4;					// Can't be > than my_off_t
+#endif
 }
 
 
-- 
cgit v1.2.1