into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0

into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0

into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0

into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-merge

into  bk-internal.mysql.com:/data0/bk/mysql-5.0-kt

into  bk-internal.mysql.com:/data0/bk/mysql-5.0-kt

into  mysql.com:/home/hf/work/mysql-5.0.20910

into  production.mysql.com:/usersnfs/rkalimullin/mysql-5.0

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0

into  xiphis.org:/opt2/tmp/autopush/mysql-5.0-fixbuild

into  bk-internal.mysql.com:/data0/bk/mysql-5.0-kt

into  mysql.com:/usr/home/ram/work/mysql-5.0

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0

into  mysql.com:/home/hf/work/mysql-5.0.20910

Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: do not release operation records for on-going read_multi_range

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0

  bug #18184  SELECT ... FOR UPDATE does not work..: New test case
ha_ndbcluster.h, ha_ndbcluster.cc, NdbConnection.hpp:
  Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit);

into  mysql.com:/usr/home/bar/mysql-5.0.b19741merge

into  xiphis.org:/home/antony/work2/mysql-5.0-merge

My previous change of replacing the call to sprintf with some memcpy type routines was not correct.  This patch reverts that.

mysql_client_test.c:
  reverting my previous change

into  zim.(none):/home/brian/mysql/dep-5.0

into  bk-internal.mysql.com:/data0/bk/mysql-5.0-kt

into  may.pils.ru:/home/svoj/devel/mysql/BUG18874/mysql-5.0

Fixed by moving update_key_parts() down to be after write_index().

Fix for bug#20648 We introduce a new field method for knowing "real size", and we now in archive null unused bits of a row to null before writing. 

into  may.pils.ru:/home/svoj/devel/mysql/BUG7391/mysql-5.0

into  bk-internal.mysql.com:/data0/bk/mysql-5.0-kt

time_format() claimed %H and %k would return at most two digits
(hours 0-23), but this coincided neither with actual behaviour
nor with docs.  this is not visible in simple queries; forcing
a temp-table is probably the easiest way to see this.  adjusted
the return-length appropriately; the alternative would be to
adjust the docs to say that behaviour for > 99 hours is undefined.
---
Bug#19844: time_format in Union truncates values

time_format() claimed %H and %k would return at most two digits
(hours 0-23), but this coincided neither with actual behaviour
nor with docs.  this is not visible in simple queries; forcing
a temp-table is probably the easiest way to see this.  adjusted
the return-length appropriately; the alternative would be to
adjust the docs to say that behaviour for > 99 hours is undefined.

myisam/mi_uniue.c:mi_check_unique() should skip trailing spaces comparing 
TEXT and VARTTEXT key segments.

two test results changed after the patch

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0