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

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

ndb/test/include/UtilTransactions.hpp:
  Fix closeTransaction in testPartitioning
ndb/test/src/HugoOperations.cpp:
  Fix closeTransaction in testPartitioning
ndb/test/src/UtilTransactions.cpp:
  Fix closeTransaction in testPartitioning

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

  fix test case
  improve testing


ndb/test/include/HugoOperations.hpp:
  Partial write (only pk)
ndb/test/ndbapi/testNdbApi.cpp:
  improve testcase
    use writePartial to verify that ops get correctly converted
    (also test negative)
ndb/test/src/HugoOperations.cpp:
  write partial + improve prinout in wait_async

into  mysql.com:/home/stewart/Documents/MySQL/5.0/wl2347

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

into  mysql.com:/home/stewart/Documents/MySQL/5.0/wl2347

Reset missed heartbeat count on receipt of signal from node.

This fixes a bug where that under high network load, the heartbeat packets could be
delayed, causing the appearance of node failure (due to lost heartbeats).


ndb/include/kernel/NodeInfo.hpp:
  Add m_heartbeat_cnt to track missed heartbeats
ndb/include/transporter/TransporterCallback.hpp:
  add prototype for transporter_recv_from()
  
  Called on receipt from a node.
ndb/src/common/transporter/TransporterRegistry.cpp:
  Add calls to transporter_receive_from when data is received (before unpack)
ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
  remove NodeRec::alarmCount. missed heartbeat count now kept in NodeInfo
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Use NodeInfo::m_heartbeat_cnt for missed heartbeat count
ndb/src/kernel/vm/TransporterCallback.cpp:
  add transporter_recv_from(), which is called on receipt of signals.
  It resets missed heartbeat count for that node.
ndb/src/ndbapi/ClusterMgr.cpp:
  Use NodeInfo::m_heartbeat_cnt for missed heartbeat count
ndb/src/ndbapi/ClusterMgr.hpp:
  Use NodeInfo::m_heartbeat_cnt instead of ClusterMgr::Node::hbSent for missed
  heartbeat count.
  
  We now use the same storage for API and Kernel heartbeats.
  
  Add ClusterMgr::hb_received(nodeId) to reset hbSent (as if we received a heartbeat,
  but callable from elsewhere - e.g. when signal received)
ndb/src/ndbapi/TransporterFacade.cpp:
  Implement transporter_recv_from for ndbapi - which resets hbSent
ndb/src/ndbapi/TransporterFacade.hpp:
  Add hb_received(nodeId)

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


ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
  Auto merged
ndb/tools/restore/restore_main.cpp:
  Auto merged

  Fix invalid backup log when using #nodes != 2^x
  Fix ndb_restore --printXXX options
    (among other init counters)


ndb/src/kernel/blocks/backup/Backup.cpp:
  remove frag_mask since in 5.0 extra frag bit in in bit 0
ndb/src/kernel/blocks/backup/Backup.hpp:
  remove frag_mask since in 5.0 extra frag bit in in bit 0
ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
  send "real" frag id to backup
ndb/tools/restore/Restore.cpp:
  Changed prinout (since it's wrong if you only print stuff)
ndb/tools/restore/consumer_printer.hpp:
  Init log/data count in printer
ndb/tools/restore/restore_main.cpp:
  Fix if-statements
    for correct handling of ndb_restore flags

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


mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
strings/ctype-utf8.c:
  Auto merged

into  mysql.com:/home/stewart/Documents/MySQL/5.0/main

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

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


VC++Files/libmysqld/libmysqld.dsp:
  Auto merged

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

into  mysql.com:/home/stewart/Documents/MySQL/5.0/main

into  radha.local:/Users/patg/mysql-build/mysql-5.0.msvensson

tree on brian's amd 64 box (which was already approved). 

[patg@zim mysql-5.0]$ bk changes
ChangeSet@1.1882, 2005-07-21 18:43:55+05:00, gluh@eagle.intranet.mysql.r18.ru
  merge fix

Was the changeset level I applied this patch to.

Master shutdown finished
Slave shutdown finished
All 326 tests were successful.

[patg@zim mysql-5.0]$ 


client/mysqldump.c:
  This is a fresh application of Magnus Svensson's patch for bug 10431
mysql-test/r/mysqldump.result:
  Fresh application of Magnus Svensson's patch for bug 10431
mysql-test/t/mysqldump.test:
  fresh application of Magnus Svensson's patch for bug 10431

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

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

Post-review fixes for WL#2713 "Change IM behaviour so, that it only reads and alters one config file only."


server-tools/instance-manager/commands.cc:
  get rid of single_defaults_file_option and use Options::config_file instead
server-tools/instance-manager/commands.h:
  get rid of single_defaults_file_option and use Options::config_file instead
server-tools/instance-manager/instance_map.cc:
  get rid of single_defaults_file_option and use Options::config_file instead
server-tools/instance-manager/instance_map.h:
  get rid of single_defaults_file_option and use Options::config_file instead
server-tools/instance-manager/manager.cc:
  get rid of single_defaults_file_option and use Options::config_file instead
server-tools/instance-manager/options.cc:
  Disable --defaults-extra-file and --no-defaults options for the IM as they have no sence. 
  Don't use print_defaults as it prints out wrong "first option" information for IM. Use only
  Options::config_file to process options
server-tools/instance-manager/options.h:
  get rid of single_defaults_file_option and use Options::config_file instead

  Declare 'mutex_list' and 'mutex_list_mutex' extern,
  to avoid link error on OS X and gcc flag "-fno-common"


innobase/include/sync0sync.h:
  Use 'extern' variable declarations, to avoid
  "ld: multiple definitions of symbol" for 'mutex_list'
  and 'mutex_list_mutex' on OS X and gcc flag "-fno-common"
innobase/sync/sync0sync.c:
  Use 'extern' variable declarations, to avoid
  "ld: multiple definitions of symbol" for 'mutex_list'
  and 'mutex_list_mutex' on OS X and gcc flag "-fno-common"

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


sql/share/charsets/Index.xml:
  Auto merged
strings/ctype-latin1.c:
  Auto merged

into  mysql.com:/home/stewart/Documents/MySQL/5.0/main

VC++Files/libmysqld/libmysqld.dsp:
  we should have SAFEMALLOC here

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

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

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

  removing extra empty line
  ,


strings/ctype-latin1.c:
  removing extra empty line
  ,

Index.xml:
  Fixing latin1 comment:
  it is actually cp1252, not iso-8859-1
ctype_latin1.result:
  changeing test results accordingly.
ctype-latin1.c:
  Fixed to- and from-Unicode conversion maps
  for better Unicode round trip of undefined
  characters.



strings/ctype-latin1.c:
  Bug#11216: 'show character set' describes latin1 incorrectly
  Fixed to- and from-Unicode conversion maps.
mysql-test/r/ctype_latin1.result:
  changeing test results accordingly.
sql/share/charsets/Index.xml:
  Fixing comment: iso-8859-1 -> cp1252

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

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

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

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


myisam/mi_create.c:
  Auto merged

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

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

Implemented on brian's request.


server-tools/instance-manager/Makefile.am:
  define default config file
server-tools/instance-manager/commands.cc:
  Use specified or default file to edit with SET commands instead of hardcoded file
server-tools/instance-manager/commands.h:
  add member to SET commands
server-tools/instance-manager/instance_map.cc:
  rename first_option -> single_defaults_option, made logging a bit more verbose
server-tools/instance-manager/instance_map.h:
  rename first_option -> single_defaults_file + made it public
server-tools/instance-manager/manager.cc:
  rename first_option -> single_defaults_file
server-tools/instance-manager/mysqlmanager.cc:
  goto generic error label instead of simple return
server-tools/instance-manager/options.cc:
  skip --defaults-extra file and give a message if it was specified, made IM
  to read one config file only
server-tools/instance-manager/options.h:
  added new members to the option structure