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


ndb/tools/ndb_config.cpp:
  merge

  Check returnvalue on load/fetch configuration


ndb/tools/ndb_config.cpp:
  Check returnvalue on load/fetch configuration

  Add support/test for using my.cnf [cluster_config]


mysql-test/r/ndb_config.result:
  Add support for ndb_config to read my.cnf
mysql-test/t/ndb_config.test:
  Add support for ndb_config to read my.cnf
ndb/src/mgmsrv/InitConfigFileParser.cpp:
  merge
ndb/tools/ndb_config.cpp:
  Add support for ndb_config to read my.cnf
mysql-test/std_data/ndb_config_mycnf1.cnf:
  New BitKeeper file ``mysql-test/std_data/ndb_config_mycnf1.cnf''

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


mysql-test/r/ndb_config.result:
  Auto merged
mysql-test/t/ndb_config.test:
  Auto merged
ndb/src/mgmsrv/InitConfigFileParser.cpp:
  Auto merged
ndb/src/mgmsrv/InitConfigFileParser.hpp:
  Auto merged
ndb/tools/ndb_config.cpp:
  Auto merged

 add support for reading config.ini from ndb_config
 (as alternative to contacting ndb_mgmd)


mysql-test/r/ndb_config.result:
  Add support for reading config.ini from ndb_config
mysql-test/t/ndb_config.test:
  Add support for reading config.ini from ndb_config
ndb/src/mgmsrv/InitConfigFileParser.cpp:
  Handle prinouts better
ndb/src/mgmsrv/InitConfigFileParser.hpp:
  Handle prinouts better
ndb/tools/ndb_config.cpp:
  Add support for reading config.ini from ndb_config

  allow ndb_mgmd to use my.cnf for cluster configuration


ndb/src/mgmsrv/ConfigInfo.cpp:
  Depricate Id infavor of nodeid in config.ini
ndb/src/mgmsrv/InitConfigFileParser.cpp:
  Add support for getting cluster config from my.cnf [cluster_config]
ndb/src/mgmsrv/InitConfigFileParser.hpp:
  Add support for getting cluster config from my.cnf [cluster_config]
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Add support for getting cluster config from my.cnf [cluster_config]
ndb/src/mgmsrv/MgmtSrvrConfig.cpp:
  Add support for getting cluster config from my.cnf [cluster_config]
ndb/src/mgmsrv/main.cpp:
  Add support for getting cluster config from my.cnf [cluster_config]

 analog with defaults_extra_file and defaults_grouop_suffix


include/my_sys.h:
  export forced_defaults_file using global variable defaults_file
mysys/default.c:
  export forced_defaults_file using global variable defaults_file

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


mysql-test/r/ndb_alter_table.result:
  Auto merged
mysql-test/t/ndb_alter_table.test:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged

  ndb big alter table


mysql-test/r/ndb_alter_table.result:
  Add testcase for bug#13316
mysql-test/t/ndb_alter_table.test:
  Add testcase for bug#13316

  ndb alter table with big dicttabinfo
  send alter_tab_req fragmented as signal can get larger than MAX_MESSAGE_SIZE


ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  DictTabInfo used during alter table can easily becom larger than MAX_MESSAGE_SIZE
    send fragmented instead

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


ndb/src/ndbapi/Ndbinit.cpp:
  Auto merged

ndb/src/ndbapi/Ndbinit.cpp:
  fix gcc4 compile problem

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


ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Auto merged
ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
  merge

    ndb backup with charsets and simultanious updates
    make sure that backup _dont_ read xfrm data


ndb/src/kernel/blocks/backup/Backup.cpp:
  Backup can do dirty read
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Fix so that backup dont read xfrm data
ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
  Fix so that backup dont read xfrm data

ndb/include/ndbapi/NdbTransaction.hpp:
  post merge fixes
ndb/src/ndbapi/Ndblist.cpp:
  post merge fixes
sql/ha_ndbcluster.cc:
  post merge fixes

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


ndb/include/ndbapi/NdbBlob.hpp:
  Auto merged
ndb/include/ndbapi/NdbOperation.hpp:
  Auto merged
ndb/include/ndbapi/NdbRecAttr.hpp:
  Auto merged
ndb/src/ndbapi/NdbApiSignal.cpp:
  Auto merged
ndb/src/ndbapi/NdbApiSignal.hpp:
  Auto merged
ndb/src/ndbapi/NdbBlob.cpp:
  Auto merged
ndb/src/ndbapi/NdbRecAttr.cpp:
  Auto merged
ndb/src/ndbapi/Ndbif.cpp:
  Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
  Auto merged
ndb/test/include/NDBT_Test.hpp:
  Auto merged
ndb/test/ndbapi/bank/BankLoad.cpp:
  Auto merged
ndb/test/ndbapi/testOIBasic.cpp:
  Auto merged
ndb/test/src/NdbBackup.cpp:
  Auto merged
ndb/test/src/NdbRestarts.cpp:
  Auto merged
ndb/tools/restore/Restore.cpp:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
ndb/include/ndbapi/Ndb.hpp:
  merge
ndb/include/ndbapi/NdbIndexOperation.hpp:
  merge
ndb/include/ndbapi/NdbIndexScanOperation.hpp:
  merge
ndb/include/ndbapi/NdbTransaction.hpp:
  merge
ndb/src/ndbapi/NdbImpl.hpp:
  merge
ndb/src/ndbapi/Ndblist.cpp:
  merge
ndb/test/src/HugoCalculator.cpp:
  merge
ndb/test/src/NDBT_Test.cpp:
  merge
sql/ha_ndbcluster.cc:
  merge
sql/mysqld.cc:
  merge
sql/sql_lex.h:
  merge
sql/sql_parse.cc:
  merge

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

into  mysql.com:/home/cps/mysql/trees/mysql-5.0-virgin

server-tools/instance-manager/buffer.cc:
  perform initialization of static consts in .cc file to respect VC6
server-tools/instance-manager/buffer.h:
  fix compiler warning
server-tools/instance-manager/commands.cc:
  fix compiler warning
server-tools/instance-manager/user_map.cc:
  fix compiler warning

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

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0


client/mysqltest.c:
  Merged from 4.1.

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1


client/mysqltest.c:
  Merged from 4.0.

  Bug #13152 bit fields and fields that follow become corrupted when dumped from NDB tables

  that dump free list allocation per connection


sql/ha_ndbcluster.cc:
  imlp. show engine ndb status;
    that dump free list allocation per connection
sql/ha_ndbcluster.h:
  imlp. show engine ndb status;
    that dump free list allocation per connection
sql/mysqld.cc:
  imlp. show engine ndb status;
    that dump free list allocation per connection
sql/sql_lex.h:
  imlp. show engine ndb status;
    that dump free list allocation per connection
sql/sql_parse.cc:
  imlp. show engine ndb status;
    that dump free list allocation per connection
sql/sql_yacc.yy:
  imlp. show engine ndb status;
    that dump free list allocation per connection

into mysql.com:/Users/kent/mysql/bk/mysql-5.0


mysql-test/mysql-test-run.pl:
  Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
  Auto merged

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


ndb/src/ndbapi/Ndbinit.cpp:
  Auto merged

  Added flag --valgrind-mysqltest


mysql-test/mysql-test-run.pl:
  Added flag --valgrind-mysqltest

  big delete from causing NdbObjectIdMap::expand at same time 
  as receiver thread perform getObjectId 


ndb/src/ndbapi/Ndbinit.cpp:
  Protect NdbObjectIdMap::expand from getObjectId
ndb/src/ndbapi/ObjectMap.hpp:
  Protect NdbObjectIdMap::expand from getObjectId

into mysql.com:/Users/kent/mysql/bk/mysql-5.0


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

  Bug#10504: additional test


mysql-test/t/ctype_utf8.test:
  Bug#10504: additional test
mysql-test/r/ctype_utf8.result:
  Bug#10504: additional test

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

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


mysql-test/r/view.result:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/sql_view.cc:
  Auto merged

sql/parse_file.cc:
  Fix after discussion/review with Sanja: removed rename_view from sql_view to general function rename_in_schema_file
  (so it can be used for other .frm types like triggers too)
sql/parse_file.h:
  added prototype for rename_in_schema_file
sql/sql_rename.cc:
  simplified code (thanks to Sanja)
sql/sql_view.cc:
  moved rename_view_files to rename_in_schema_file (parse_file.cc)
  corrected MYF parameter from MY_WME to 0.

into  snake-hub.snake.net:/src/extern/MySQL/bk/merge-4.1

into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0

into  snake-hub.snake.net:/src/extern/MySQL/bk/merge-4.1

  Delete: man/which.2


BitKeeper/deleted/.del-which.2~463417adb2e37122:
  Delete: man/which.2

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