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

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

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

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


scripts/Makefile.am:
  Auto merged

  make_binary_distribution, make_sharedlib_distribution and make_win_src_distribution
- removed make_win_binary_distribution.sh


BitKeeper/deleted/.del-make_win_binary_distribution.sh~e0fbb0a75af0dcd3:
  Auto merged
scripts/Makefile.am:
  - after merge fix: removed the "all" target - these files are now built via
    noinst_SCRIPTS instead.

  make_win_src_distribution are created, but not installed
- removed make_win_binary_distribution.sh as it's obsolete and outdated


BitKeeper/deleted/.del-make_win_binary_distribution.sh~e0fbb0a75af0dcd3:
  Delete: scripts/make_win_binary_distribution.sh
scripts/Makefile.am:
  - Make sure the scripts make_binary_distribution, make_sharedlib_distribution and
    make_win_src_distribution are created, but not installed. This is the proper fix
    for what I began in the previous ChangeSet
  - removed make_win_binary_distribution.sh from the distribution, as it's obsolete
    and outdated

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

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


ndb/include/mgmapi/mgmapi_config_parameters.h:
  Auto merged
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged

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

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


ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.hpp:
  Auto merged

ndb/include/mgmapi/mgmapi_config_parameters.h:
  Fix LCP during SR parameters
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Fix LCP during SR parameters
ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  Fix LCP during SR parameters
ndb/src/mgmsrv/ConfigInfo.cpp:
  Fix LCP during SR parameters

added export symbols mysql_server_init and 
mysql_server_end to allow client to connect to external and embedded
server using the same code (required for Connector/OO.org). (Backport from 5.0 - cs. 1.35)

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

mysql-test/r/ndb_config.result:
  New BitKeeper file ``mysql-test/r/ndb_config.result''
mysql-test/t/ndb_config.test:
  New BitKeeper file ``mysql-test/t/ndb_config.test''

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


ndb/include/mgmapi/mgmapi.h:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.hpp:
  Auto merged
ndb/src/mgmapi/mgmapi.cpp:
  merge
ndb/tools/Makefile.am:
  merge

into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0

ndb/include/mgmapi/mgmapi.h:
  Add feature to redirect error printouts
ndb/src/mgmapi/mgmapi.cpp:
  Add feature to redirect error printouts
ndb/src/mgmsrv/ConfigInfo.hpp:
  Make param info public
ndb/tools/Makefile.am:
  Add ndb_config
ndb/tools/config.cpp:
  New BitKeeper file ``ndb/tools/config.cpp''

into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug1-5.0


BitKeeper/etc/config:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_cache.cc:
  Auto merged
mysql-test/r/query_cache.result:
  SCCS merged
mysql-test/t/query_cache.test:
  SCCS merged

mysql-test/r/query_cache.result:
  query in QC from normal execution and SP
mysql-test/t/query_cache.test:
  environment restoring fix
  layout fix
  query in QC from normal execution and SP
sql/mysql_priv.h:
  store SERVER_MORE_RESULTS_EXISTS
sql/sql_cache.cc:
  store SERVER_MORE_RESULTS_EXISTS in key of query cache
BitKeeper/etc/config:
  switching logging off

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


sql/table.cc:
  Auto merged

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


sql/sql_parse.cc:
  Auto merged
sql/share/errmsg.txt:
  SCCS merged

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


mysys/thr_lock.c:
  Auto merged
sql/ha_federated.cc:
  Auto merged