diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-11-03 14:49:17 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-11-03 14:49:17 +0200 |
| commit | 533a13af069d8c9e6c5f4e1a72851497185ade03 (patch) | |
| tree | 4623752e0c114e582fbbc0afcc02b67dede26b50 /storage/blackhole | |
| parent | 4b3690b50433a169d9feed5dc45044a8934b5582 (diff) | |
| parent | e6290a8270daf884f551230307225b358939bfab (diff) | |
| download | mariadb-git-533a13af069d8c9e6c5f4e1a72851497185ade03.tar.gz | |
Merge 10.3 into 10.4
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 6ee30877b64..e827cd25bfc 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; } |