diff options
| author | monty@hundin.mysql.fi <> | 2001-10-31 03:22:31 +0200 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2001-10-31 03:22:31 +0200 |
| commit | 5a9ce774dc413ac7b6342a9097f4e2456d0df63f (patch) | |
| tree | a7cd1bf6f7f295d11ffce88081f69bc1963bfd06 /isam | |
| parent | 7f38949c6be7dba794a786b4fe53132f7f5751e5 (diff) | |
| download | mariadb-git-5a9ce774dc413ac7b6342a9097f4e2456d0df63f.tar.gz | |
Update for OS2 (patch from Yuri Dario).
Use LONG_TIMEOUT (one year) instead of ~0 for long timeouts
Fixed error messages.
Fixed problem with const propagation when comparing columns of different types
Diffstat (limited to 'isam')
| -rw-r--r-- | isam/create.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/isam/create.c b/isam/create.c index bcdd6b0892a..c59b20d8b0c 100644 --- a/isam/create.c +++ b/isam/create.c @@ -253,10 +253,10 @@ 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 : |