diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-02-01 09:33:26 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-02-01 09:33:26 +0100 |
| commit | 27d45e46968e4bd623565688a997b83b0a5cc1a8 (patch) | |
| tree | 8df9c87f8fd3855d81e3ae46078d34609668e63a /include | |
| parent | 27fbb637d36324992b270f0dc0472807ffa4ebc2 (diff) | |
| download | mariadb-git-27d45e46968e4bd623565688a997b83b0a5cc1a8.tar.gz | |
MDEV-5574 Set AUTO_INCREMENT below max value of column.
Update InnoDB to 5.6.14
Apply MySQL-5.6 hack for MySQL Bug#16434374
Move Aria-only HA_RTREE_INDEX from my_base.h to maria_def.h (breaks an assert in InnoDB)
Fix InnoDB memory leak
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_base.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/my_base.h b/include/my_base.h index c9f9a8a4ed3..2880b52e6e2 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -264,13 +264,11 @@ enum ha_base_keytype { #define HA_SPATIAL 1024 /* For spatial search */ #define HA_NULL_ARE_EQUAL 2048 /* NULL in key are cmp as equal */ #define HA_GENERATED_KEY 8192 /* Automaticly generated key */ -#define HA_RTREE_INDEX 16384 /* For RTREE search */ /* The combination of the above can be used for key type comparison. */ #define HA_KEYFLAG_MASK (HA_NOSAME | HA_PACK_KEY | HA_AUTO_KEY | \ HA_BINARY_PACK_KEY | HA_FULLTEXT | HA_UNIQUE_CHECK | \ - HA_SPATIAL | HA_NULL_ARE_EQUAL | HA_GENERATED_KEY | \ - HA_RTREE_INDEX) + HA_SPATIAL | HA_NULL_ARE_EQUAL | HA_GENERATED_KEY) /* Key contains partial segments. |