bk commit into 5.0 tree (serg:1.1962) BUG#14433

[Sergei Golubchik]

Below is the list of changes that have just been committed into a local
5.0 repository of serg. When serg 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
  1.1962 05/11/16 15:17:08 serg@stripped +3 -0
  bug#14433 - archive uses wrong ref_length

  sql/ha_archive.cc
    1.61 05/11/16 15:16:53 serg@stripped +2 -1
    bug#14433 - archive uses wrong ref_length

  mysql-test/t/func_group.test
    1.45 05/11/16 15:16:53 serg@stripped +2 -2
    re-enable the test

  mysql-test/t/disabled.def
    1.14 05/11/16 15:16:53 serg@stripped +0 -1
    bug#14433 - archive uses wrong ref_length

# 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:	serg
# Host:	serg.mylan
# Root:	/usr/home/serg/Abk/mysql-5.0

--- 1.60/sql/ha_archive.cc	Wed Oct 26 22:54:56 2005
+++ 1.61/sql/ha_archive.cc	Wed Nov 16 15:16:53 2005
@@ -233,7 +233,8 @@ ha_archive::ha_archive(TABLE *table_arg)
   buffer.set((char *)byte_buffer, IO_SIZE, system_charset_info);
 
   /* The size of the offset value we will use for position() */
-  ref_length = sizeof(z_off_t);
+  ref_length = 2 << ((zlibCompileFlags() >> 6) & 3);
+  DBUG_ASSERT(ref_length <= sizeof(z_off_t));
 }
 
 /*

--- 1.13/mysql-test/t/disabled.def	Thu Nov  3 18:01:19 2005
+++ 1.14/mysql-test/t/disabled.def	Wed Nov 16 15:16:53 2005
@@ -15,4 +15,3 @@ rpl_relayrotate : Unstable test case, bu
 rpl_until       : Unstable test case, bug#12429
 rpl_deadlock    : Unstable test case, bug#12429
 kill            : Unstable test case, bug#9712
-archive_gis     : The test fails on 32bit Linux

--- 1.44/mysql-test/t/func_group.test	Thu Oct 13 14:32:00 2005
+++ 1.45/mysql-test/t/func_group.test	Wed Nov 16 15:16:53 2005
@@ -2,8 +2,6 @@
 # simple test of all group functions
 #
 
---source include/have_innodb.inc
-
 --disable_warnings
 drop table if exists t1,t2;
 --enable_warnings
@@ -545,10 +543,12 @@ DROP TABLE t1;
 # Bug #12882  	min/max inconsistent on empty table
 #
 
+--disable_warnings
 create table t1m (a int) engine=myisam;
 create table t1i (a int) engine=innodb;
 create table t2m (a int) engine=myisam;
 create table t2i (a int) engine=innodb;
+--enable_warnings
 insert into t2m values (5);
 insert into t2i values (5);