Commit 48e91809 authored by unknown's avatar unknown
Browse files

Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0 

into production.mysql.com:/usersnfs/istruewing/autopush/mysql-5.0
parents 5951caea dcf5d348

mysql-test/t/disabled.def

+0 −1
Original line number Diff line number Diff line
@@ -15,4 +15,3 @@ rpl_relayrotate : Unstable test case, bug#12429 
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

mysql-test/t/func_group.test

+2 −2
Original line number Diff line number Diff line
@@ -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);

sql/ha_archive.cc

+2 −1
Original line number Diff line number Diff line
@@ -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));

}



/*