From 11ff375efd71ac8794aad06c62e6efbbdc6d8165 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 27 Oct 2004 21:51:27 +0200 Subject: - 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) --- myisam/myisampack.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'myisam') 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 -- cgit v1.2.1