diff options
| author | unknown <serg@serg.mylan> | 2004-10-22 22:44:08 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2004-10-22 22:44:08 +0200 |
| commit | d23e048c1749be81cd65a7faeab15a24484f4ea5 (patch) | |
| tree | a91b3c9517ce1f289a4ded0ee0d20f5618330c4a /myisam | |
| parent | 2c32fdc67c0030c8ec9aeb90f5459bd4b407b103 (diff) | |
| parent | d871ea8aa885187d2d7273adab908c0c0d06fad0 (diff) | |
| download | mariadb-git-d23e048c1749be81cd65a7faeab15a24484f4ea5.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
sql/sql_parse.cc:
Auto merged
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 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 |