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

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

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

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

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

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

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

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

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

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

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.

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

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.

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

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

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

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

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

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

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

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

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

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

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

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

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

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

When linking with some external programs, "multiple definition 
of `init_time'"

Rename init_time() to my_init_time() to avoid collision with other
libraries (particularly libmng).

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

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