diff options
| author | unknown <lenz@mysql.com> | 2004-10-27 21:51:27 +0200 |
|---|---|---|
| committer | unknown <lenz@mysql.com> | 2004-10-27 21:51:27 +0200 |
| commit | 11ff375efd71ac8794aad06c62e6efbbdc6d8165 (patch) | |
| tree | ef3ff402e3597d2f3413b6d105d438f718b8f7a8 /myisam | |
| parent | 3bdd7e77fdb66acb4d051dec2b1c4fd136a49f9c (diff) | |
| download | mariadb-git-11ff375efd71ac8794aad06c62e6efbbdc6d8165.tar.gz | |
- Applied some Windows portability fixes for myisampack.c and sql_handler.cc
(backports from fixes made in 4.1)
myisam/myisampack.c:
- replaced "1ULL" with "((ulonglong)1)" to resolve a compile error on
Windows
sql/sql_handler.cc:
- removed some unused variables
- added a (byte*) cast to fix a compile error on Windows (backport of a
fix made in 4.1)
Diffstat (limited to 'myisam')
| -rw-r--r-- | myisam/myisampack.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/myisam/myisampack.c b/myisam/myisampack.c index 0dde1916f03..9f4e3bde65a 100644 --- a/myisam/myisampack.c +++ b/myisam/myisampack.c @@ -2047,7 +2047,7 @@ static int save_state(MI_INFO *isam_file,PACK_MRG_INFO *mrg,my_off_t new_length, share->state.dellink= HA_OFFSET_ERROR; share->state.split=(ha_rows) mrg->records; share->state.version=(ulong) time((time_t*) 0); - if (share->state.key_map != (1ULL << share->base.keys) - 1) + if (share->state.key_map != (((ulonglong)1) << share->base.keys) - 1) { /* Some indexes are disabled, cannot use current key_file_length value |