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


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

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


mysql-test/r/create.result:
  Auto merged
mysql-test/r/func_str.result:
  Auto merged
mysql-test/t/func_str.test:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
mysql-test/t/create.test:
  Resolve conflict
sql/mysql_priv.h:
  Resolve conflict
sql/table.cc:
  Resolve conflict
sql/unireg.cc:
  Resolve conflict

mysys/thr_lock.c:
  Use set_timespec() macro instead of calling gettimeofday()

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

This is for the release bk tree, same change as 1.1890, which JimW approved.


sql/ha_federated.cc:
  removed DBUG code

client via mysql_fetch_fields(). (Bug #11311)


mysql-test/r/func_str.result:
  Add new results
mysql-test/t/func_str.test:
  Add new regression test
sql/item_strfunc.cc:
  Fix length reported for LPAD() and RPAD() -- they always truncate to the
  length that is given.

Necessary to compile 5.0.10 on Windows, no bug report filed.


include/config-win.h:
  Add the definition of "floatget" (as taken from "include/my_config.h", matching the common "floatstore").
  Necessary to compile 5.0.10 on Windows, no bug report filed.

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

  Change an ` quote to ' (' is used everywhere else)
  This does not affect any test results.


sql/share/errmsg.txt:
  Change an ` quote to ' (' is used everywhere else)
  This does not affect any test results.

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


strings/ctype-gbk.c:
  Auto merged

  Bug #11987
  mysql will truncate the text when the text contain GBK char:"0xA3A0" and "0xA1"
  Allow to store and retrieve even unassigned GBK codes.
  Like we did in Big5 earlier.
have_gbk.inc, have_gbk.require, ctype_gbk.result, ctype_gbk.test:
  new file


strings/ctype-gbk.c:
  Bug #11987
  mysql will truncate the text when the text contain GBK char:"0xA3A0" and "0xA1"
  Allow to store and retrieve even unassigned GBK codes.
  Like we did in Big5 earlier.

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

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

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:/home/stewart/Documents/MySQL/4.1/main

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

non-existent database. (Bug #10407)


mysql-test/r/create.result:
  Update results
mysql-test/t/create.test:
  Update error numbers
sql/mysql_priv.h:
  Adjust some other function signature so table and db information
  is passed down into create_frm().
sql/sql_table.cc:
  Check for database not existing after hitting an error when
  copying the .frm file for 'CREATE TABLE ... LIKE ...', and
  pass table and db name into rea_create_table().
sql/table.cc:
  Generate specific error message when .frm creation fails because
  the database does not exist.
sql/unireg.cc:
  Pass database and table name down into create_frm().

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/stewart/Documents/MySQL/4.1/main

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