diff options
author | unknown <monty@tik.mysql.fi> | 2002-04-12 21:35:46 +0300 |
---|---|---|
committer | unknown <monty@tik.mysql.fi> | 2002-04-12 21:35:46 +0300 |
commit | 6326ec9944e8ab44fceff629d6681700573ab686 (patch) | |
tree | 0060cbed8a1f7a8adaca0a4dc2e74b3372e28361 /sql/ha_myisammrg.h | |
parent | 40a27740878e945bbdf667c3735a41727d343ed1 (diff) | |
download | mariadb-git-6326ec9944e8ab44fceff629d6681700573ab686.tar.gz |
Update for BTREE keys in HEAP tables
Split handler->option_flag() to handler->table_flags() and handler->index_flags()
Docs/manual.texi:
Updated standard binary options
include/my_base.h:
Update for BTREE keys in HEAP tables
libmysql/net.c:
merge with net_serv.cc
mysql-test/r/func_misc.result:
Update for new behaviour of inet_ntoa
sql/field.cc:
Update for BTREE keys in HEAP tables
sql/field.h:
Update for BTREE keys in HEAP tables
sql/filesort.cc:
Update for BTREE keys in HEAP tables
sql/ha_berkeley.h:
Update for BTREE keys in HEAP tables
sql/ha_heap.h:
Update for BTREE keys in HEAP tables
sql/ha_innodb.h:
Update for BTREE keys in HEAP tables
sql/ha_isam.cc:
Update for BTREE keys in HEAP tables
sql/ha_isam.h:
Update for BTREE keys in HEAP tables
sql/ha_isammrg.h:
Update for BTREE keys in HEAP tables
sql/ha_myisam.cc:
Update for BTREE keys in HEAP tables
sql/ha_myisam.h:
Update for BTREE keys in HEAP tables
sql/ha_myisammrg.h:
Update for BTREE keys in HEAP tables
sql/handler.cc:
Update for BTREE keys in HEAP tables
sql/handler.h:
Update for BTREE keys in HEAP tables
sql/log.cc:
Update for BTREE keys in HEAP tables
sql/net_serv.cc:
Update for BTREE keys in HEAP tables
sql/opt_range.cc:
Update for BTREE keys in HEAP tables
sql/opt_sum.cc:
Update for BTREE keys in HEAP tables
sql/records.cc:
Update for BTREE keys in HEAP tables
sql/sql_class.h:
Update for BTREE keys in HEAP tables
sql/sql_handler.cc:
Update for BTREE keys in HEAP tables
sql/sql_insert.cc:
Update for BTREE keys in HEAP tables
sql/sql_select.cc:
Update for BTREE keys in HEAP tables
sql/sql_show.cc:
Update for BTREE keys in HEAP tables
sql/sql_table.cc:
Update for BTREE keys in HEAP tables
sql/structs.h:
Update for BTREE keys in HEAP tables
sql/table.cc:
Update for BTREE keys in HEAP tables
sql/unireg.cc:
Update for BTREE keys in HEAP tables
Diffstat (limited to 'sql/ha_myisammrg.h')
-rw-r--r-- | sql/ha_myisammrg.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sql/ha_myisammrg.h b/sql/ha_myisammrg.h index 2ab3a807543..ed2817f3ca6 100644 --- a/sql/ha_myisammrg.h +++ b/sql/ha_myisammrg.h @@ -32,13 +32,13 @@ class ha_myisammrg: public handler ~ha_myisammrg() {} const char *table_type() const { return "MRG_MyISAM"; } const char **bas_ext() const; - ulong option_flag() const - { return (HA_REC_NOT_IN_SEQ | HA_READ_NEXT | - HA_READ_PREV | HA_READ_RND_SAME | - HA_HAVE_KEY_READ_ONLY | - HA_KEYPOS_TO_RNDPOS | HA_READ_ORDER | - HA_LASTKEY_ORDER | HA_READ_NOT_EXACT_KEY | - HA_NULL_KEY | HA_BLOB_KEY); } + ulong table_flags() const + { + return (HA_REC_NOT_IN_SEQ | HA_READ_RND_SAME | + HA_HAVE_KEY_READ_ONLY | HA_KEYPOS_TO_RNDPOS | + HA_LASTKEY_ORDER | + HA_NULL_KEY | HA_BLOB_KEY); + } uint max_record_length() const { return HA_MAX_REC_LENGTH; } uint max_keys() const { return MI_MAX_KEY; } uint max_key_parts() const { return MAX_REF_PARTS; } |