diff options
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/ha_myisam.h | 2 | ||||
| -rw-r--r-- | sql/ha_myisammrg.h | 2 | ||||
| -rw-r--r-- | sql/handler.h | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/sql/ha_myisam.h b/sql/ha_myisam.h index f4c45e6524b..72ff6024109 100644 --- a/sql/ha_myisam.h +++ b/sql/ha_myisam.h @@ -63,7 +63,7 @@ class ha_myisam: public handler } uint max_supported_keys() const { return MI_MAX_KEY; } 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; int open(const char *name, int mode, uint test_if_locked); diff --git a/sql/ha_myisammrg.h b/sql/ha_myisammrg.h index 9a6b2a7ee14..9a663db148c 100644 --- a/sql/ha_myisammrg.h +++ b/sql/ha_myisammrg.h @@ -46,7 +46,7 @@ class ha_myisammrg: public handler } uint max_supported_keys() const { return MI_MAX_KEY; } 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() { return ulonglong2double(data_file_length) / IO_SIZE + file->tables; } diff --git a/sql/handler.h b/sql/handler.h index a9416b1b2c5..8474899b39e 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -256,7 +256,6 @@ public: time_t create_time; /* When table was created */ time_t check_time; time_t update_time; - enum {NONE=0, INDEX, RND} inited; /* The following are for read_range() */ key_range save_end_range, *end_range; @@ -273,6 +272,7 @@ public: uint raid_type,raid_chunks; FT_INFO *ft_handler; bool auto_increment_column_changed; + enum {NONE=0, INDEX, RND} inited; bool implicit_emptied; /* Can be !=0 only if HEAP */ @@ -472,7 +472,7 @@ public: virtual uint max_supported_keys() const { return 0; } 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_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 bool low_byte_first() const { return 1; } |