From de048905881f400bb0adc8089c410caac08c7c6a Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Mon, 26 Aug 2013 21:03:01 +0400 Subject: typo fixed (boolean index attributes didn't work) --- sql/handler.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sql/handler.h') diff --git a/sql/handler.h b/sql/handler.h index bc7a17bb27c..c9fce1e773b 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -758,8 +758,8 @@ enum ha_option_type { HA_OPTION_TYPE_ULL, /* unsigned long long */ HA_xOPTION_STRING(name, ha_index_option_struct, field) #define HA_IOPTION_ENUM(name, field, values, def) \ HA_xOPTION_ENUM(name, ha_index_option_struct, field, values, def) -#define HA_IOPTION_BOOL(name, field, values, def) \ - HA_xOPTION_BOOL(name, ha_index_option_struct, field, values, def) +#define HA_IOPTION_BOOL(name, field, def) \ + HA_xOPTION_BOOL(name, ha_index_option_struct, field, def) #define HA_IOPTION_END HA_xOPTION_END typedef struct st_ha_create_table_option { -- cgit v1.2.1 From a73972bfea653df3b82c89ae9bd61b012757e40b Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Mon, 26 Aug 2013 21:13:17 +0400 Subject: don't decide on extended keys by DB_TYPE_INNODB, use hton->flags --- sql/handler.h | 1 + 1 file changed, 1 insertion(+) (limited to 'sql/handler.h') diff --git a/sql/handler.h b/sql/handler.h index c9fce1e773b..0bbed8ad35e 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -1076,6 +1076,7 @@ inline LEX_STRING *hton_name(const handlerton *hton) #define HTON_TEMPORARY_NOT_SUPPORTED (1 << 6) //Having temporary tables not supported #define HTON_SUPPORT_LOG_TABLES (1 << 7) //Engine supports log tables #define HTON_NO_PARTITION (1 << 8) //You can not partition these tables +#define HTON_EXTENDED_KEYS (1 << 9) //supports extended keys class Ha_trx_info; -- cgit v1.2.1 From 5bc410e022cf5c7d400e2ca73e9d6899897aecc6 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Mon, 9 Sep 2013 13:34:17 +0200 Subject: workaround for partitioning bug MDEV-4466 (fixed in 10.0) --- sql/handler.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'sql/handler.h') diff --git a/sql/handler.h b/sql/handler.h index 0bbed8ad35e..cbc0a13aafe 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -357,7 +357,8 @@ enum legacy_db_type /** Performance schema engine. */ DB_TYPE_PERFORMANCE_SCHEMA, DB_TYPE_ARIA=42, - DB_TYPE_FIRST_DYNAMIC=43, + DB_TYPE_TOKUDB=43, + DB_TYPE_FIRST_DYNAMIC=44, DB_TYPE_DEFAULT=127 // Must be last }; /* -- cgit v1.2.1 From 9c98876ca19b05781497a03f05a4bf8d861fb205 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Mon, 9 Sep 2013 14:00:18 +0200 Subject: tokudb patches for prepare range scan --- sql/handler.h | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'sql/handler.h') diff --git a/sql/handler.h b/sql/handler.h index cbc0a13aafe..5b83d8c9556 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -1868,6 +1868,16 @@ public: } /* This is called after index_init() if we need to do a index scan */ virtual int prepare_index_scan() { return 0; } + virtual int prepare_index_key_scan_map(const uchar * key, key_part_map keypart_map) + { + uint key_len= calculate_key_len(table, active_index, key, keypart_map); + return prepare_index_key_scan(key, key_len); + } + virtual int prepare_index_key_scan( const uchar * key, uint key_len ) + { return 0; } + virtual int prepare_range_scan(const key_range *start_key, const key_range *end_key) + { return 0; } + int ha_rnd_init(bool scan) __attribute__ ((warn_unused_result)) { DBUG_EXECUTE_IF("ha_rnd_init_fail", return HA_ERR_TABLE_DEF_CHANGED;); -- cgit v1.2.1