diff options
| author | unknown <monty@narttu.mysql.fi> | 2007-12-18 03:23:35 +0200 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2007-12-18 03:23:35 +0200 |
| commit | 630169c6d896bd33b65866d91f2bd8894b79bfa1 (patch) | |
| tree | bab66d8939b49d5484b4bf83490baa0e357a8bb9 /include/my_base.h | |
| parent | 30d3d8d3fc41d04f2f90389a42f27520ed63b41b (diff) | |
| parent | 488cf72078d3e0a5e9b48db515f977fabd8e8170 (diff) | |
| download | mariadb-git-630169c6d896bd33b65866d91f2bd8894b79bfa1.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-maria
into mysql.com:/home/my/mysql-maria
include/my_base.h:
Auto merged
mysql-test/r/maria.result:
Auto merged
sql/handler.h:
Auto merged
storage/maria/ha_maria.cc:
Auto merged
Diffstat (limited to 'include/my_base.h')
| -rw-r--r-- | include/my_base.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/my_base.h b/include/my_base.h index 7dfdbe97ba3..2cd259426c2 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -296,8 +296,10 @@ enum ha_base_keytype { #define HA_OPTION_RELIES_ON_SQL_LAYER 512 #define HA_OPTION_NULL_FIELDS 1024 #define HA_OPTION_PAGE_CHECKSUM 2048 -#define HA_OPTION_TEMP_COMPRESS_RECORD ((uint) 16384) /* set by isamchk */ -#define HA_OPTION_READ_ONLY_DATA ((uint) 32768) /* Set by isamchk */ +#define HA_OPTION_TEMP_COMPRESS_RECORD (1L << 15) /* set by isamchk */ +#define HA_OPTION_READ_ONLY_DATA (1L << 16) /* Set by isamchk */ +#define HA_OPTION_NO_CHECKSUM (1L << 17) +#define HA_OPTION_NO_DELAY_KEY_WRITE (1L << 18) /* Bits in flag to create() */ |