diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-10-31 03:22:31 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-10-31 03:22:31 +0200 |
| commit | 4765ab612ca4f5ee35c413437f7da04889bd0a14 (patch) | |
| tree | a7cd1bf6f7f295d11ffce88081f69bc1963bfd06 /isam | |
| parent | bacf546eaaa2666a1634ea224af2c53cb17dcfb9 (diff) | |
| download | mariadb-git-4765ab612ca4f5ee35c413437f7da04889bd0a14.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
BitKeeper/deleted/.del-.cvsignore~a91d63182f0b2366:
Delete: sql/share/norwegian/.cvsignore
BitKeeper/deleted/.del-.cvsignore~469064b5190d703d:
Delete: sql/share/norwegian-ny/.cvsignore
Docs/manual.texi:
Changelog
client/client_priv.h:
Update for OS2
client/mysqldump.c:
Update for OS2
include/mysqld_error.h:
Updated error texts
isam/create.c:
Removed warning
myisam/myisamchk.c:
Fix for OS2
myisam/myisampack.c:
Fix for OS2
mysys/mf_cache.c:
Fix for OS2
mysys/mf_tempfile.c:
Fix for OS2
mysys/my_os2file64.c:
Fix for OS2
mysys/my_tempnam.c:
Fix for OS2
os2/ChangeLog.os2:
Fix for OS2
os2/MySQL-Client.icc:
Fix for OS2
os2/MySQL-Opt.icc:
Fix for OS2
os2/MySQL-Source.icc:
Fix for OS2
os2/MySQL-Sql.icc:
Fix for OS2
os2/MySQL-Util.icc:
Fix for OS2
sql/mysqld.cc:
Use LONG_TIMEOUT (one year) instead of ~0 for long timeouts. This avoids some problems when users spefices wrong arguments to mysqld.
sql/nt_servc.cc:
C
sql/share/czech/errmsg.txt:
Updated error texts
sql/share/danish/errmsg.txt:
Updated error texts
sql/share/dutch/errmsg.txt:
Updated error texts
sql/share/english/errmsg.txt:
Updated error texts
sql/share/estonian/errmsg.txt:
Updated error texts
sql/share/french/errmsg.txt:
Updated error texts
sql/share/german/errmsg.txt:
Updated error texts
sql/share/greek/errmsg.txt:
Updated error texts
sql/share/hungarian/errmsg.txt:
Updated error texts
sql/share/italian/errmsg.txt:
Updated error texts
sql/share/japanese/errmsg.txt:
Updated error texts
sql/share/korean/errmsg.txt:
Updated error texts
sql/share/norwegian-ny/errmsg.txt:
Updated error texts
sql/share/norwegian/errmsg.txt:
Updated error texts
sql/share/polish/errmsg.txt:
Updated error texts
sql/share/portuguese/errmsg.txt:
Updated error texts
sql/share/romanian/errmsg.txt:
Updated error texts
sql/share/russian/errmsg.txt:
Updated error texts
sql/share/slovak/errmsg.txt:
Updated error texts
sql/share/spanish/errmsg.txt:
Updated error texts
sql/share/swedish/errmsg.txt:
Updated error texts
sql/share/ukrainian/errmsg.txt:
Updated error texts
sql/sql_select.cc:
Fixed problem with const propagation when comparing columns of different types.
Fixed bug when HEAP table is converted to MyISAM tables in GROUP BY on long strings.
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 : |