diff options
author | monty@donna.mysql.com <> | 2000-09-14 02:39:07 +0300 |
---|---|---|
committer | monty@donna.mysql.com <> | 2000-09-14 02:39:07 +0300 |
commit | b581f17be222af50b399242353fd6df31b6b05d5 (patch) | |
tree | 47d3199e561726437875c3247556ac5797525366 /sql/ha_myisammrg.h | |
parent | 7e543b4d4b67b7108d72bf1f1a8b22f99937c886 (diff) | |
download | mariadb-git-b581f17be222af50b399242353fd6df31b6b05d5.tar.gz |
Fixes for MERGE TABLES and HEAP tables
Diffstat (limited to 'sql/ha_myisammrg.h')
-rw-r--r-- | sql/ha_myisammrg.h | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/sql/ha_myisammrg.h b/sql/ha_myisammrg.h index 864b2f1760c..376c4edf18f 100644 --- a/sql/ha_myisammrg.h +++ b/sql/ha_myisammrg.h @@ -32,15 +32,19 @@ 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_LONGLONG_KEYS+HA_NULL_KEY+HA_BLOB_KEY; } + 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_LONGLONG_KEYS | HA_NULL_KEY | HA_BLOB_KEY); } uint max_record_length() const { return HA_MAX_REC_LENGTH; } - uint max_keys() const { return 1; } + uint max_keys() const { return MI_MAX_KEY; } uint max_key_parts() const { return MAX_REF_PARTS; } uint max_key_length() const { return MAX_KEY_LENGTH; } + virtual double scan_time() + { return ulonglong2double(data_file_length) / IO_SIZE + file->tables; } int open(const char *name, int mode, int test_if_locked); int close(void); |