diff options
| author | monty@hundin.mysql.fi <> | 2001-11-04 16:14:09 +0200 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2001-11-04 16:14:09 +0200 |
| commit | fd0780493d9f91c1b4e8a0ff80fc670d5cf3b19a (patch) | |
| tree | 689c9d0271e23431f1ab0ac09e1af4d68a58ca76 /isam | |
| parent | 67951fdeb4195d6fcefeba6aab811b6c5e585178 (diff) | |
| parent | 65d4c846d83467270e56537b2cd0f44fc37ef9be (diff) | |
| download | mariadb-git-fd0780493d9f91c1b4e8a0ff80fc670d5cf3b19a.tar.gz | |
merge with 3.23.44
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 ! */ |