summaryrefslogtreecommitdiff
path: root/sql/ha_isammrg.h
diff options
context:
space:
mode:
authorunknown <serg@serg.mysql.com>2001-10-23 10:52:51 +0200
committerunknown <serg@serg.mysql.com>2001-10-23 10:52:51 +0200
commit11572916ffb543e5b89db156a46a265d251bf768 (patch)
tree6f045be38734a0b7be25eee3c7755b68e6152904 /sql/ha_isammrg.h
parent151ffe886b4b21499471658fdf01ea8347287092 (diff)
downloadmariadb-git-11572916ffb543e5b89db156a46a265d251bf768.tar.gz
HA_NO_FULLTEXT_KEY and an appropriate error message
include/mysqld_error.h: New error message added libmysql/violite.c: FreeBSD fix sql/ha_berkeley.h: HA_NO_FULLTEXT_KEY sql/ha_heap.h: HA_NO_FULLTEXT_KEY sql/ha_innobase.h: HA_NO_FULLTEXT_KEY sql/ha_isam.h: HA_NO_FULLTEXT_KEY sql/ha_isammrg.h: HA_NO_FULLTEXT_KEY sql/ha_myisammrg.h: HA_NO_FULLTEXT_KEY sql/share/czech/errmsg.txt: New error message added sql/share/danish/errmsg.txt: New error message added sql/share/dutch/errmsg.txt: New error message added sql/share/english/errmsg.txt: New error message added sql/share/estonian/errmsg.txt: New error message added sql/share/french/errmsg.txt: New error message added sql/share/german/errmsg.txt: New error message added sql/share/greek/errmsg.txt: New error message added sql/share/hungarian/errmsg.txt: New error message added sql/share/italian/errmsg.txt: New error message added sql/share/japanese/errmsg.txt: New error message added sql/share/korean/errmsg.txt: New error message added sql/share/norwegian-ny/errmsg.txt: New error message added sql/share/norwegian/errmsg.txt: New error message added sql/share/polish/errmsg.txt: New error message added sql/share/portuguese/errmsg.txt: New error message added sql/share/romanian/errmsg.txt: New error message added sql/share/russian/errmsg.txt: New error message added sql/share/slovak/errmsg.txt: New error message added sql/share/spanish/errmsg.txt: New error message added sql/share/swedish/errmsg.txt: New error message added sql/share/ukrainian/errmsg.txt: New error message added sql/sql_table.cc: FULLTEXT checks fixed sql/violite.c: FreeBSD fix
Diffstat (limited to 'sql/ha_isammrg.h')
-rw-r--r--sql/ha_isammrg.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/ha_isammrg.h b/sql/ha_isammrg.h
index edced83d85d..c8eb7dd9f69 100644
--- a/sql/ha_isammrg.h
+++ b/sql/ha_isammrg.h
@@ -32,7 +32,8 @@ class ha_isammrg: public handler
~ha_isammrg() {}
const char *table_type() const { return "MRG_ISAM"; }
const char **bas_ext() const;
- ulong option_flag() const { return HA_READ_RND_SAME+HA_KEYPOS_TO_RNDPOS+HA_REC_NOT_IN_SEQ;}
+ ulong option_flag() const { return HA_READ_RND_SAME | HA_KEYPOS_TO_RNDPOS
+ | HA_REC_NOT_IN_SEQ | HA_NO_FULLTEXT_KEY;}
uint max_record_length() const { return HA_MAX_REC_LENGTH; }
uint max_keys() const { return 0; }
uint max_key_parts() const { return 0; }