bk commit into 5.0 tree (svoj:1.2492) BUG#15787

[Sergey Vojtovich]

Below is the list of changes that have just been committed into a local
5.0 repository of svoj. When svoj does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-06-21 14:52:56+05:00, svoj@stripped +1 -0
  BUG#15787 - MySQL crashes when archive table exceeds 2GB
  
  Max compressed file size was calculated incorretly causing server
  crash on INSERT.
  
  With this patch we use proper max file size provided by zlib.
  
  No test case for this fix, since it requires huge table.

  sql/ha_archive.cc@stripped, 2007-06-21 14:52:54+05:00, svoj@stripped +1 -1
    When calculating max compressed file size, use the real offset size
    that is provided by zlib, instead of sizeof(z_off_t), which may be
    different from actual limitation.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	svoj
# Host:	june.mysql.com
# Root:	/home/svoj/devel/mysql/BUG15787/mysql-5.0-engines

--- 1.85/sql/ha_archive.cc	2007-04-12 14:46:05 +05:00
+++ 1.86/sql/ha_archive.cc	2007-06-21 14:52:54 +05:00
@@ -205,7 +205,7 @@ bool archive_db_init()
   else
   {
     zoffset_size= 2 << ((zlibCompileFlags() >> 6) & 3);
-    switch (sizeof(z_off_t)) {
+    switch (zoffset_size) {
     case 2:
       max_zfile_size= INT_MAX16;
       break;