summaryrefslogtreecommitdiff
path: root/myisam/myisampack.c
diff options
context:
space:
mode:
authorlenz@mysql.com <>2004-10-27 21:51:27 +0200
committerlenz@mysql.com <>2004-10-27 21:51:27 +0200
commit6b720d93be6c63b4f340ef1add6db4cb96f90fe2 (patch)
treeef3ff402e3597d2f3413b6d105d438f718b8f7a8 /myisam/myisampack.c
parentd5691702d78c703f92c13396cc901baffbffdd19 (diff)
downloadmariadb-git-6b720d93be6c63b4f340ef1add6db4cb96f90fe2.tar.gz
- Applied some Windows portability fixes for myisampack.c and sql_handler.cc
(backports from fixes made in 4.1)
Diffstat (limited to 'myisam/myisampack.c')
-rw-r--r--myisam/myisampack.c2
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