into  hh-nb.hungers:/work/merge/mysql-5.1-build

into  hh-nb.hungers:/work/merge/mysql-5.1-wl4288


mysql-test/t/disabled.def:
  Auto merged

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

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


mysql-test/t/type_blob.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/tztime.cc:
  Auto merged
sql/unireg.h:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
mysql-test/r/type_blob.result:
  manual merge
sql/item_create.cc:
  manual merge

sql/field.cc:
  Fix indentation of new line.

into  hh-nb.hungers:/work/merge/mysql-5.1-build


BitKeeper/etc/ignore:
  auto-union

BitKeeper/etc/ignore:
  Added mysql-test/linux_sys_vars.inc mysql-test/load_sysvars.inc mysql-test/windows_sys_vars.inc to the ignore list

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

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


sql/field.cc:
  Auto merged
sql/unireg.h:
  Auto merged
mysql-test/r/type_blob.result:
  manual merge.
mysql-test/t/type_blob.test:
  manual merge.
sql/item_create.cc:
  manual merge.
sql/share/errmsg.txt:
  manual merge.
sql/sql_yacc.yy:
  manual merge.

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


mysql-test/r/type_blob.result:
  Auto merged
mysql-test/t/type_blob.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/unireg.h:
  Auto merged

into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776-encore/my51-bug15776-encore


sql/field.cc:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/unireg.h:
  Auto merged
mysql-test/r/type_blob.result:
  manual merge.
mysql-test/t/type_blob.test:
  manual merge.
sql/sql_yacc.yy:
  merge by hand.

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


mysql-test/r/type_blob.result:
  Auto merged
mysql-test/t/type_blob.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/unireg.h:
  Auto merged

into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776-encore/my50-bug15776-encore


sql/field.cc:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/unireg.h:
  Auto merged
mysql-test/r/type_blob.result:
  manual merge.
mysql-test/t/type_blob.test:
  manual merge.

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


mysql-test/r/type_blob.result:
  Auto merged
mysql-test/t/type_blob.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/unireg.h:
  Auto merged

Make maximum blob size to be 2**32-1, regardless of word size.

Fix failure of timestamp with size of 2**31-1.  The method of
rounding up to the nearest even number would overflow.


mysql-test/r/type_blob.result:
  2**32-1 is not a special case for timestamp.
  
  Test 2**32-1 and 2**64 as the reliable test points for both 32-
  and 64-bit machines.  I'd like to test 2**32, but that would make 
  tests that vary between architectures.
  
  I'd like to generalize the tests by pulling the max blob size from
  the server, and then "eval"ing N-1, N, and N+1 instead of all these
  literal numbers, but I have not found a way to get UINT_MAX.
mysql-test/t/type_blob.test:
  2**32-1 is not a special case for timestamp.
  
  Test 2**32-1 and 2**64 as the reliable test points for both 32-
  and 64-bit machines.  I'd like to test 2**32, but that would make 
  tests that vary between architectures.
  
  I'd like to generalize the tests by pulling the max blob size from
  the server, and then "eval"ing N-1, N, and N+1 instead of all these
  literal numbers, but I have not found a way to get UINT_MAX.
sql/field.cc:
  Fix a bug where the round-to-even code for TIMESTAMP fields
  failed where the size would overflow the size to zero and then
  fail.
  
  Also, since we silently truncate the size of TIMESTAMP fields, set
  the maximum size we report is allowable to be the largest parsable
  number.
sql/unireg.h:
  Make BLOB size the maximum that the packed value in 
  field_blob::get_length() allows.

into  five.local.lan:/work/trees/mysql-5.1-build-src-clean

   #12713 Error in a stored function called from a
          SELECT doesn't cause ROLLBACK of statem


mysql-test/r/func_rollback.result:
  Expected results
mysql-test/t/func_rollback.test:
  New test

into  trift2.:/MySQL/M51/work-5.1

into  trift2.:/MySQL/M51/push-5.1

into  trift2.:/MySQL/M51/tmp-5.1

into  trift2.:/MySQL/M51/tmp-5.1

Null merge - changes specific to 5.1.24-rc are superseded by better ones done in parallel.


mysql-test/suite/funcs_1/r/innodb_storedproc_02.result:
  Null merge.
mysql-test/suite/funcs_1/r/innodb_trig_03e.result:
  Null merge.
mysql-test/suite/funcs_1/r/memory_storedproc_02.result:
  Null merge.
mysql-test/suite/funcs_1/r/memory_trig_03e.result:
  Null merge.
mysql-test/suite/funcs_1/r/myisam_storedproc_02.result:
  Null merge.
mysql-test/suite/funcs_1/r/myisam_trig_03e.result:
  Null merge.
mysql-test/suite/funcs_1/r/ndb_storedproc_02.result:
  Null merge.
mysql-test/suite/funcs_1/r/ndb_trig_03e.result:
  Null merge.
mysql-test/suite/funcs_1/storedproc/storedproc_02.inc:
  Null merge.
mysql-test/suite/funcs_1/storedproc/storedproc_master.inc:
  Null merge.
mysql-test/suite/funcs_1/r/innodb_storedproc.result:
  Null merge - changes specific to 5.1.24-rc are superseded by better ones done in parallel.
mysql-test/suite/funcs_1/r/memory_storedproc.result:
  Null merge - changes specific to 5.1.24-rc are superseded by better ones done in parallel.
mysql-test/suite/funcs_1/r/myisam_storedproc.result:
  Null merge - changes specific to 5.1.24-rc are superseded by better ones done in parallel.
mysql-test/suite/funcs_1/r/ndb_storedproc.result:
  Null merge - changes specific to 5.1.24-rc are superseded by better ones done in parallel.

into  trift2.:/MySQL/M51/push-5.1

into  trift2.:/MySQL/M51/tmp-5.1

into  five.local.lan:/work/trees/mysql-5.1-build-src-clean


mysql-test/Makefile.am:
  Auto merged

into  five.local.lan:/work/merge/mysql-5.1-funcs_1


mysql-test/Makefile.am:
  Fix of Makefile.am has happened by Changeset of Joerg

into  five.local.lan:/work/trees/mysql-5.0-build-src-clean

mysql-test/Makefile.am   :    Fix a copy-paste error ...


mysql-test/Makefile.am:
  Correct the variables used for target directory
  of copy action.

into  five.local.lan:/work/merge/mysql-5.0-build

into  five.local.lan:/work/merge/mysql-5.1-build

mysql-test/Makefile.am:
  Fix a copy-paste error ...
  In this place, "$(distdir)" expands to empty, resulting in absolute "/std_data/funcs_1"

into  trift2.:/MySQL/M51/push-5.1


mysql-test/suite/rpl/r/rpl_packet.result:
  Auto merged
mysql-test/suite/rpl/t/rpl_packet.test:
  Auto merged
sql/share/errmsg.txt:
  Auto merged

into  trift2.:/MySQL/M51/push-5.1


sql/share/errmsg.txt:
  Auto merged

into  trift-lap.fambruehe:/MySQL/M51/push-5.1


mysql-test/suite/rpl/r/rpl_packet.result:
  Auto merged
mysql-test/suite/rpl/t/rpl_packet.test:
  Auto merged
sql/share/errmsg.txt:
  Auto merged

into  trift-lap.fambruehe:/MySQL/M51/push-5.1

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


sql/tztime.cc:
  Auto merged

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


sql/tztime.cc:
  Auto merged