diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-10-30 17:23:53 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-10-30 17:23:53 +0100 |
| commit | 794f66513967891520ec432123dcff8270871b93 (patch) | |
| tree | da31ab80611c016e9dca9af28ffd65c4a838e2f5 /storage/blackhole | |
| parent | 14d43f4fa691e3af113195a3608f1fc401b85090 (diff) | |
| parent | 72eea39d4c4a8bcadccfdac457e61abc7b618ff8 (diff) | |
| download | mariadb-git-794f66513967891520ec432123dcff8270871b93.tar.gz | |
Merge branch '10.2' into 10.3
Diffstat (limited to 'storage/blackhole')
| -rw-r--r-- | storage/blackhole/ha_blackhole.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/storage/blackhole/ha_blackhole.h b/storage/blackhole/ha_blackhole.h index ea026c5837c..9caa6e967d4 100644 --- a/storage/blackhole/ha_blackhole.h +++ b/storage/blackhole/ha_blackhole.h @@ -20,6 +20,7 @@ #include "thr_lock.h" /* THR_LOCK */ #include "handler.h" /* handler */ #include "table.h" /* TABLE_SHARE */ +#include "sql_const.h" /* MAX_KEY */ /* Shared structure for correct LOCK operation @@ -65,9 +66,9 @@ public: HA_READ_ORDER | HA_KEYREAD_ONLY); } /* The following defines can be increased if necessary */ -#define BLACKHOLE_MAX_KEY 64 /* Max allowed keys */ +#define BLACKHOLE_MAX_KEY MAX_KEY /* Max allowed keys */ #define BLACKHOLE_MAX_KEY_SEG 16 /* Max segments for key */ -#define BLACKHOLE_MAX_KEY_LENGTH 1000 +#define BLACKHOLE_MAX_KEY_LENGTH 3500 /* Like in InnoDB */ uint max_supported_keys() const { return BLACKHOLE_MAX_KEY; } uint max_supported_key_length() const { return BLACKHOLE_MAX_KEY_LENGTH; } uint max_supported_key_part_length() const { return BLACKHOLE_MAX_KEY_LENGTH; } |