into mysql.com:/home/gluh/MySQL/Merge/5.0

Bug #12112

Fix for bug#12127 triggers do not show in info_schema before they are used if set to the database(2nd version)
  use db name of table which trigger belongs to
  instead of thd->db name during trigger body parsing

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

into deer.(none):/home/hf/work/mysql-5.0.clean

into deer.(none):/home/hf/work/mysql-4.1.11329

into deer.(none):/home/hf/work/mysql-5.0.clean

into deer.(none):/home/hf/work/mysql-4.1.9110

into deer.(none):/home/hf/work/mysql-4.1.10839

into deer.(none):/home/hf/work/mysql-4.1.6740

into  hundin.mysql.fi:/home/marko/mysql-5.0

into  hundin.mysql.fi:/home/marko/mysql-4.1

into rurik.mysql.com:/home/igor/dev/mysql-5.0-0

  Post review change in Item_ref::get_tmp_table_field (bug #11412).

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

into  mysql.com:/usr/home/bar/mysql-4.1.b12109

into  hundin.mysql.fi:/home/marko/mysql-5.0

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

ctype-cp932.c:
ctype-gbk.c:
ctype-mb.c:
ctype-simple.c:
ctype-sjis.c:
ctype-ucs2.c:
ctype-ujis.c:
ctype-utf8.c:

  Adding explicit cast to return type
  in pointer substructions to avoid
  warnings from some compilers.

data files.  Previously, writes were flushed until the doublewrite
buffer was created.  That would be too slow on systems where
os_file_flush() [or fsync(2)] is slow.  (Bug #12125)

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

item.cc:
  After merge fixes.
func_gconcat.result:
  After merge fixes

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

into  mysql.com:/usr/home/bar/mysql-4.1.b10201

  Adding test
item_sum.cc:
  Adding a call for collation/charset aggregation,
      to collect attributes from the arguments. The actual bug fix.
item_func.h, item_func.cc, item.h, item.cc:
  - Removing collation aggrgation functions from Item_func class
      in item.cc, and adding it as non-class functions in item.cc
      to be able to reuse this code for group_concat.
      - Adding replacement for these functions into Item_func class
      as wrappers for moved functions, to minizize patch size,

into  hundin.mysql.fi:/home/jan/mysql-5.0

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

into  mysql.com:/home/jonas/src/mysql-5.0-push

into  mysql.com:/home/jonas/src/mysql-5.0-push

into  mysql.com:/home/jonas/src/mysql-5.0

into  mysql.com:/home/jonas/src/mysql-4.1-push

into  hundin.mysql.fi:/home/jan/mysql-5.0