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:/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 lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0

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

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 lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0

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.0/main

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

mysql-test/r/sp.result:
  added expected result for bug #8692
mysql-test/t/sp.test:
  added testcase for bug #8692
sql/protocol_cursor.cc:
  fixed detecting of null fields: A field contains a null value only 
  if length is NULL_LENGTH