Commit b6cb8cb5 authored by konstantin@mysql.com's avatar konstantin@mysql.com

Followup to cleanup in handler interface.

parent 8162e97a
...@@ -63,7 +63,7 @@ class ha_myisam: public handler ...@@ -63,7 +63,7 @@ class ha_myisam: public handler
} }
uint max_supported_keys() const { return MI_MAX_KEY; } uint max_supported_keys() const { return MI_MAX_KEY; }
uint max_supported_key_length() const { return MI_MAX_KEY_LENGTH; } uint max_supported_key_length() const { return MI_MAX_KEY_LENGTH; }
uint max_supported_key_part_length() { return MI_MAX_KEY_LENGTH; } uint max_supported_key_part_length() const { return MI_MAX_KEY_LENGTH; }
uint checksum() const; uint checksum() const;
int open(const char *name, int mode, uint test_if_locked); int open(const char *name, int mode, uint test_if_locked);
......
...@@ -46,7 +46,7 @@ class ha_myisammrg: public handler ...@@ -46,7 +46,7 @@ class ha_myisammrg: public handler
} }
uint max_supported_keys() const { return MI_MAX_KEY; } uint max_supported_keys() const { return MI_MAX_KEY; }
uint max_supported_key_length() const { return MI_MAX_KEY_LENGTH; } uint max_supported_key_length() const { return MI_MAX_KEY_LENGTH; }
uint max_supported_key_part_length() { return MI_MAX_KEY_LENGTH; } uint max_supported_key_part_length() const { return MI_MAX_KEY_LENGTH; }
double scan_time() double scan_time()
{ return ulonglong2double(data_file_length) / IO_SIZE + file->tables; } { return ulonglong2double(data_file_length) / IO_SIZE + file->tables; }
......
...@@ -256,7 +256,6 @@ class handler :public Sql_alloc ...@@ -256,7 +256,6 @@ class handler :public Sql_alloc
time_t create_time; /* When table was created */ time_t create_time; /* When table was created */
time_t check_time; time_t check_time;
time_t update_time; time_t update_time;
enum {NONE=0, INDEX, RND} inited;
/* The following are for read_range() */ /* The following are for read_range() */
key_range save_end_range, *end_range; key_range save_end_range, *end_range;
...@@ -273,6 +272,7 @@ class handler :public Sql_alloc ...@@ -273,6 +272,7 @@ class handler :public Sql_alloc
uint raid_type,raid_chunks; uint raid_type,raid_chunks;
FT_INFO *ft_handler; FT_INFO *ft_handler;
bool auto_increment_column_changed; bool auto_increment_column_changed;
enum {NONE=0, INDEX, RND} inited;
bool implicit_emptied; /* Can be !=0 only if HEAP */ bool implicit_emptied; /* Can be !=0 only if HEAP */
...@@ -472,7 +472,7 @@ class handler :public Sql_alloc ...@@ -472,7 +472,7 @@ class handler :public Sql_alloc
virtual uint max_supported_keys() const { return 0; } virtual uint max_supported_keys() const { return 0; }
virtual uint max_supported_key_parts() const { return MAX_REF_PARTS; } virtual uint max_supported_key_parts() const { return MAX_REF_PARTS; }
virtual uint max_supported_key_length() const { return MAX_KEY_LENGTH; } virtual uint max_supported_key_length() const { return MAX_KEY_LENGTH; }
virtual uint max_supported_key_part_length() { return 255; } virtual uint max_supported_key_part_length() const { return 255; }
virtual uint min_record_length(uint options) const { return 1; } virtual uint min_record_length(uint options) const { return 1; }
virtual bool low_byte_first() const { return 1; } virtual bool low_byte_first() const { return 1; }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment