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

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

  Fixed bug #11412.
  Reversed the patch of cs 1.1934 for the function 
  create_tmp_table. Modified the function to support
  tem_ref objects created for view fields.
item_buff.cc:
  Fixed bug #11412.
  Modified implementation of new_Cached_item to support
  cacheing of view fields.
item.h:
  Fixed bug #11412.
  Changed implementation of Item_ref::get_tmp_table_field and
  added Item_ref::get_tmp_table_item to support Item_ref objects
  created for view fields.
view.test, view.result:
  Added a test case for bug #11412.

  Bug#12109 possible locking bug in init_available_charset
  Recheck charset_initialized inside locked code,
  to garantee two threads are not entering
  consequently.

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

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

into mysql.com:/space/my/mysql-4.1

into mysql.com:/space/my/mysql-4.1

into mysql.com:/space/my/mysql-5.0-build