diff options
| author | Konstantin Osipov <kostja@sun.com> | 2010-02-02 12:22:17 +0300 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2010-02-02 12:22:17 +0300 |
| commit | 3147bdd0ac34a5c62158b8c28da6ca77e0901f08 (patch) | |
| tree | 919a1043e20b3f1f6a58331ae90a4a9529b0ab5e /storage/myisam/myisamdef.h | |
| parent | 2c6015e8dc962bef8f353af920581d9b6bd7fd82 (diff) | |
| parent | 5bce1e06429c3d58457051f0c439f130609df375 (diff) | |
| download | mariadb-git-3147bdd0ac34a5c62158b8c28da6ca77e0901f08.tar.gz | |
Merge next-mr -> next-4284.
Diffstat (limited to 'storage/myisam/myisamdef.h')
| -rw-r--r-- | storage/myisam/myisamdef.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/storage/myisam/myisamdef.h b/storage/myisam/myisamdef.h index 43746975232..a1142ff418a 100644 --- a/storage/myisam/myisamdef.h +++ b/storage/myisam/myisamdef.h @@ -442,7 +442,6 @@ typedef struct st_mi_sort_param #define MI_MAX_BLOCK_LENGTH ((((ulong) 1 << 24)-1) & (~ (ulong) (MI_DYN_ALIGN_SIZE-1))) #define MI_REC_BUFF_OFFSET ALIGN_SIZE(MI_DYN_DELETE_BLOCK_HEADER+sizeof(uint32)) -#define MEMMAP_EXTRA_MARGIN 7 /* Write this as a suffix for file */ #define PACK_TYPE_SELECTED 1 /* Bits in field->pack_type */ #define PACK_TYPE_SPACE_FIELDS 2 |