From: Date: September 29 2006 6:36pm
Subject: bk commit into 5.0 tree (svoj:1.2285) BUG#21675
List-Archive: http://lists.mysql.com/commits/12855
X-Bug: 21675
Message-Id: <20060929163622.7EF71E6D@april.pils.ru>

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, 2006-09-29 21:36:17+05:00, svoj@stripped +1 -0
  Fixed that max_zfile_size was incorrectly calculated on big-endian boxes.
  Was introduced with patch for bug#21675.

  sql/ha_archive.cc@stripped, 2006-09-29 21:36:16+05:00, svoj@stripped +11 -1
    Fixed that max_zfile_size was incorrectly calculated on big-endian boxes.
    Was introduced with patch for bug#21675.

# 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:	april.(none)
# Root:	/home/svoj/devel/mysql/engines/mysql-5.0-engines

--- 1.73/sql/ha_archive.cc	2006-09-29 21:36:22 +05:00
+++ 1.74/sql/ha_archive.cc	2006-09-29 21:36:22 +05:00
@@ -206,7 +206,17 @@ bool archive_db_init()
   else
   {
     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;
     DBUG_RETURN(FALSE);
   }