From b6ca95a7f4ca001dd50569eea2a5e3af4d284c76 Mon Sep 17 00:00:00 2001
From: "serg@sergbook.mysql.com" <>
Date: Wed, 23 Apr 2003 14:03:21 +0400
Subject: warning when a 4.1 MYI file is opened in 4.0

---
 myisam/mi_open.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'myisam/mi_open.c')

diff --git a/myisam/mi_open.c b/myisam/mi_open.c
index 60049325c5c..2f3ef872492 100644
--- a/myisam/mi_open.c
+++ b/myisam/mi_open.c
@@ -182,6 +182,9 @@ MI_INFO *mi_open(const char *name, int mode, uint open_flags)
     }
     share->state_diff_length=len-MI_STATE_INFO_SIZE;
 
+    if (share->state.header.fulltext_keys)
+      fprintf(stderr, "Table file %s was created in MySQL 4.1+, use REPAIR TABLE ... USE_FRM to recreate it as a valid MySQL 4.0 table\n", name_buff);
+
     mi_state_info_read(disk_cache, &share->state);
     len= mi_uint2korr(share->state.header.base_info_length);
     if (len != MI_BASE_INFO_SIZE)
-- 
cgit v1.2.1


From bf6cfd2948f4cbab120a76aaf16d7ca0739cf2f4 Mon Sep 17 00:00:00 2001
From: "monty@mashka.mysql.fi" <>
Date: Sat, 26 Apr 2003 20:43:28 +0300
Subject: Fix for -fbranch-probabilites (bug 268) Fix for LEFT/RIGHT/MID with
 multi-byte-character sets (bug 314) Fix for new bison 1.875
 max_insert_delayed_threads and delayed_insert_timeout now works as documented
 (bug 211) Don't show port in SHOW PROCESSLIST for system threads Fix problem
 with ORDER BY being discarded for some DISTINCT queries (bug 275) Fixed bug
 with NATURAL LEFT JOIN, NATURAL RIGHT JOIN and RIGHT JOIN when using many
 joined tables (Bug 212)

---
 myisam/mi_open.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'myisam/mi_open.c')

diff --git a/myisam/mi_open.c b/myisam/mi_open.c
index 2f3ef872492..0ccc8a3bf40 100644
--- a/myisam/mi_open.c
+++ b/myisam/mi_open.c
@@ -183,8 +183,11 @@ MI_INFO *mi_open(const char *name, int mode, uint open_flags)
     share->state_diff_length=len-MI_STATE_INFO_SIZE;
 
     if (share->state.header.fulltext_keys)
-      fprintf(stderr, "Table file %s was created in MySQL 4.1+, use REPAIR TABLE ... USE_FRM to recreate it as a valid MySQL 4.0 table\n", name_buff);
-
+    {
+      /* Not supported in this version */
+      my_errno= HA_ERR_UNSUPPORTED;
+      goto err;
+    }
     mi_state_info_read(disk_cache, &share->state);
     len= mi_uint2korr(share->state.header.base_info_length);
     if (len != MI_BASE_INFO_SIZE)
-- 
cgit v1.2.1


From 3e72b423e39702fddca1f345d61069fe9b1343e3 Mon Sep 17 00:00:00 2001
From: "monty@narttu.mysql.fi" <>
Date: Wed, 14 May 2003 01:27:26 +0300
Subject: Fix for MacOSX and symlinks Fix for USE_FRM and crashed index file

---
 myisam/mi_open.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'myisam/mi_open.c')

diff --git a/myisam/mi_open.c b/myisam/mi_open.c
index 0ccc8a3bf40..99b97db3fbd 100644
--- a/myisam/mi_open.c
+++ b/myisam/mi_open.c
@@ -114,8 +114,10 @@ MI_INFO *mi_open(const char *name, int mode, uint open_flags)
     errpos=1;
     if (my_read(kfile,(char*) share->state.header.file_version,head_length,
 		MYF(MY_NABP)))
+    {
+      my_errno= HA_ERR_NOT_A_TABLE;
       goto err;
-
+    }
     if (memcmp((byte*) share->state.header.file_version,
 	       (byte*) myisam_file_magic, 4))
     {
@@ -165,7 +167,10 @@ MI_INFO *mi_open(const char *name, int mode, uint open_flags)
     }
     errpos=3;
     if (my_read(kfile,disk_cache,info_length,MYF(MY_NABP)))
+    {
+      my_errno=HA_ERR_CRASHED;
       goto err;
+    }
     len=mi_uint2korr(share->state.header.state_info_length);
     keys=    (uint) share->state.header.keys;
     uniques= (uint) share->state.header.uniques;
-- 
cgit v1.2.1