into  mysql.com:/home/jimw/my/mysql-5.0-clean

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


sql/field.cc:
  Auto merged
mysql-test/r/strict.result:
  merging
mysql-test/t/strict.test:
  merging

sql/sql_parse.cc:
  error function changed

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


sql/mysqld.cc:
  Auto merged

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

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


libmysqld/lib_sql.cc:
  Auto merged

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

myisam/mi_create.c:
  merging

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

sql/sql_parse.cc:
  SCCS merged

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

sql/mysqld.cc:
  code moved to the init_server_variables() so it will work in embedded server
  as well

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


sql/item.h:
  Auto merged

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


sql/item.h:
  Post review change in Item_ref::get_tmp_table_field (bug #11412).

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


mysys/charset.c:
  Auto merged

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

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


innobase/include/os0file.h:
  Automerge and manual fix
innobase/os/os0file.c:
  Automerged
innobase/trx/trx0sys.c:
  Automerged

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


BitKeeper/deleted/.del-ctype-cp932.c:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-gbk.c:
  Auto merged
strings/ctype-sjis.c:
  Auto merged
strings/ctype-mb.c:
  after merge fix
strings/ctype-simple.c:
  after merge fix
strings/ctype-ucs2.c:
  after merge fix
strings/ctype-ujis.c:
  after merge fix
strings/ctype-utf8.c:
  After merge fix

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.


strings/ctype-big5.c:
  Adding explicit cast to return type
  in pointer substructions to avoid
  warnings from some compilers.
  Adding explicit cast to return type
  in pointer substructions to avoid
  warnings from some compilers.
  Adding explicit cast to return type
  in pointer substructions to avoid
  warnings from some compilers.
strings/ctype-cp932.c:
  Adding explicit cast to return type
  in pointer substructions to avoid
  warnings from some compilers.
strings/ctype-gbk.c:
  Adding explicit cast to return type
  in pointer substructions to avoid
  warnings from some compilers.
strings/ctype-mb.c:
  Adding explicit cast to return type
  in pointer substructions to avoid
  warnings from some compilers.
strings/ctype-simple.c:
  Adding explicit cast to return type
  in pointer substructions to avoid
  warnings from some compilers.
strings/ctype-sjis.c:
  Adding explicit cast to return type
  in pointer substructions to avoid
  warnings from some compilers.
strings/ctype-ucs2.c:
  Adding explicit cast to return type
  in pointer substructions to avoid
  warnings from some compilers.
strings/ctype-ujis.c:
  Adding explicit cast to return type
  in pointer substructions to avoid
  warnings from some compilers.
strings/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)


innobase/include/os0file.h:
  Disable os_do_not_call_flush_at_each_write unless #ifdef UNIV_DO_FLUSH
innobase/os/os0file.c:
  Disable os_do_not_call_flush_at_each_write unless #ifdef UNIV_DO_FLUSH
innobase/trx/trx0sys.c:
  Disable os_do_not_call_flush_at_each_write unless #ifdef UNIV_DO_FLUSH

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

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


mysql-test/r/func_gconcat.result:
  After merge fixes
sql/item.cc:
  After merge fixes.

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


mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/t/func_gconcat.test:
  Auto merged
ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.hpp:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
include/config-netware.h:
  auto merge fix
libmysql/libmysql.def:
  after merge fix
sql/item_func.cc:
  SCCS merged

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,


sql/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,
sql/item.h:
  - 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,
sql/item_func.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,
sql/item_func.h:
  - 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,
sql/item_sum.cc:
  Adding a call for collation/charset aggregation,
      to collect attributes from the arguments. The actual bug fix.
mysql-test/t/func_gconcat.test:
  Adding test
mysql-test/r/func_gconcat.result:
  Adding test

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

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

sql/field.cc:
  a fix (bug #11546: Bad error message from inserting out of range values, SQL_MODE='tradition').
  raise an error in case of strict mode for bit fields.

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

libmysqld/lib_sql.cc:
  This should be done during the thread activation

mysql-test/r/ndb_config.result:
  changed config

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

mysql-test/t/ndb_config.test:
  test requires ndb

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