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

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/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  trift-lap.fambruehe:/MySQL/M51/push-5.1

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

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

into  trift2.:/MySQL/M50/push-5.0

  If excluding Federated, make sure dynamic plugin is not built
Makefile.am:
  Only run cluster test when compiled with cluster
lib_sql.cc:
  Work around for Visual Studio 2003, that lacks vsnprintf() but has _vsnprintf()

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

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

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

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

"funcs_1" data load

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

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

  Corrects build problems embedded on Windows
Makefile.am:
  Install .sym or mysqld-debug if exists
query_cache_debug.test, query_cache_debug.result:
  Set more resonable query cache size (bug#35749)
CMakeLists.txt:
  Added missing stacktrace.c

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

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

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