diff options
Diffstat (limited to 'isam')
| -rw-r--r-- | isam/create.c | 11 | ||||
| -rw-r--r-- | isam/pack_isam.c | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/isam/create.c b/isam/create.c index bcdd6b0892a..fcf54ddc731 100644 --- a/isam/create.c +++ b/isam/create.c @@ -253,14 +253,15 @@ int nisam_create(const char *name,uint keys,N_KEYDEF *keyinfo, share.base.fields=fields; share.base.pack_fields=packed; share.base.sortkey= (ushort) ~0; - share.base.max_data_file_length= (pointer == 4) ? ~0L : + share.base.max_data_file_length= (pointer == 4) ? (ulong) ~0L : (options & (HA_OPTION_PACK_RECORD | HA_OPTION_COMPRESS_RECORD)) ? - (1L << (pointer*8)) : - (pointer == 3 && reclength >= 256L) ? NI_POS_ERROR : + (ulong) (1L << (pointer*8)) : + (pointer == 3 && reclength >= 256L) ? (ulong) NI_POS_ERROR : ((ulong) reclength * (1L << (pointer*8))); share.base.max_key_file_length= (share.base.key_reflength == 3 ? - NI_POS_ERROR : - (1L << (share.base.key_reflength*8))*512); + NI_POS_ERROR : + (ulong) + (1L << (share.base.key_reflength*8))*512); share.base.min_block_length= (share.base.pack_reclength+3 < N_EXTEND_BLOCK_LENGTH && ! share.base.blobs) ? diff --git a/isam/pack_isam.c b/isam/pack_isam.c index b8814527af2..55f6fbf077b 100644 --- a/isam/pack_isam.c +++ b/isam/pack_isam.c @@ -288,7 +288,7 @@ static void usage(void) -?, --help display this help and exit\n\ -V, --version output version information and exit\n"); print_defaults("my",load_default_groups); -}; +} /* reads options */ /* Initiates DEBUG - but no debugging here ! */ |