Commit c672a771 authored by istruewing@chilla.local's avatar istruewing@chilla.local

Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines

into  chilla.local:/home/mydev/mysql-5.0-bug20627
parents fe7de5b9 a2c42739
...@@ -206,7 +206,17 @@ bool archive_db_init() ...@@ -206,7 +206,17 @@ bool archive_db_init()
else else
{ {
zoffset_size= 2 << ((zlibCompileFlags() >> 6) & 3); zoffset_size= 2 << ((zlibCompileFlags() >> 6) & 3);
max_zfile_size= (z_off_t) (~(1 << (zoffset_size * 8 - 1))); switch (sizeof(z_off_t)) {
case 2:
max_zfile_size= INT_MAX16;
break;
case 8:
max_zfile_size= LONGLONG_MAX;
break;
case 4:
default:
max_zfile_size= INT_MAX32;
}
archive_inited= TRUE; archive_inited= TRUE;
DBUG_RETURN(FALSE); DBUG_RETURN(FALSE);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment