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

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/bug26294/my51-bug26294


client/mysqlbinlog.cc:
  Auto merged
include/my_time.h:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/init.cc:
  Auto merged
sql/tztime.cc:
  Auto merged

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).


client/mysqlbinlog.cc:
  Rename init_time() to my_init_time().
include/my_time.h:
  Rename init_time() to my_init_time().
sql-common/my_time.c:
  Rename init_time() to my_init_time().
sql/init.cc:
  Rename init_time() to my_init_time().
sql/tztime.cc:
  Rename init_time() to my_init_time().

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


sql/sql_yacc.yy:
  Auto merged
sql/share/errmsg.txt:
  Auto merged

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


storage/innobase/handler/ha_innodb.cc:
  Auto merged

into  trift2.:/MySQL/M51/push-5.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

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()


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

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


mysql-test/mysql-test-run.pl:
  Auto merged

  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


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

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