summaryrefslogtreecommitdiff
path: root/myisam
diff options
context:
space:
mode:
authormonty@mashka.mysql.fi <>2003-04-26 20:43:28 +0300
committermonty@mashka.mysql.fi <>2003-04-26 20:43:28 +0300
commitbf6cfd2948f4cbab120a76aaf16d7ca0739cf2f4 (patch)
treed337933bf02d06131497e3097c839528e9938a07 /myisam
parentba5b57c642fccfdbac0a4b82de919dbcc2bca058 (diff)
downloadmariadb-git-bf6cfd2948f4cbab120a76aaf16d7ca0739cf2f4.tar.gz
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)
Diffstat (limited to 'myisam')
-rw-r--r--myisam/mi_open.c7
1 files changed, 5 insertions, 2 deletions
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)