summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <lenz@mysql.com>2004-10-22 22:29:43 +0200
committerunknown <lenz@mysql.com>2004-10-22 22:29:43 +0200
commit4888394df02d16553d701230b27a9491d2ede56b (patch)
treefa900f66ebfbb2483ebf8f5207863826e9939f7f
parent96aa01d995d8445b176a8b0a29ff2cf49dd8bcd4 (diff)
parent9b5ef66e0cca8d01e57a7610e9158d91d216c839 (diff)
downloadmariadb-git-4888394df02d16553d701230b27a9491d2ede56b.tar.gz
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
-rw-r--r--myisam/myisampack.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/myisam/myisampack.c b/myisam/myisampack.c
index b4b4169965d..eae75b07760 100644
--- a/myisam/myisampack.c
+++ b/myisam/myisampack.c
@@ -2050,7 +2050,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 != (ULL(1) << share->base.keys) - 1)
{
/*
Some indexes are disabled, cannot use current key_file_length value