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

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb

ndb/include/mgmapi/mgmapi.h:
  SCCS merged

  adopted to changes in mgmapi


ndb/src/mgmclient/CommandInterpreter.cpp:
  adopted to changes in mgmapi

    removed grep event and added congestion event
   more docs
    changed some naming, expecially regarding severities
    added config param for logevel for congestion


mysql-test/ndb/basic.result:
  updated ndb_mgm test
mysql-test/ndb/restart.test:
  updated ndb_mgm test
ndb/include/kernel/LogLevel.hpp:
  removed grep event and added congestion event
ndb/include/mgmapi/mgmapi.h:
  more docs
  changed some naming, expecially regarding severities
ndb/include/mgmapi/mgmapi_config_parameters.h:
  removed grep event and added congestion event
ndb/src/common/debugger/EventLogger.cpp:
  removed grep event and added congestion event
ndb/src/mgmapi/mgmapi.cpp:
  changed some naming, expecially regarding severities
ndb/src/mgmsrv/ConfigInfo.cpp:
  added config param for logevel for congestion
ndb/src/mgmsrv/Services.cpp:
  just som variable name changes

ndb/include/mgmapi/mgmapi.h:
  Documentation edits and fixes.
ndb/include/ndbapi/Ndb.hpp:
  Misc. documentation cleanup.
ndb/include/ndbapi/ndb_cluster_connection.hpp:
  Documentation edits and fixes.

moved get_configuration to doxygen internal since the "iterators" are not documented

BitKeeper/deleted/.del-CommandInterpreter.cpp~fb62c05516034e7c:
  Delete: ndb/src/mgmsrv/CommandInterpreter.cpp
BitKeeper/deleted/.del-CommandInterpreter.hpp~8d8bc7e937d7b60e:
  Delete: ndb/src/mgmsrv/CommandInterpreter.hpp
ndb/src/Makefile.am:
  Change order between subdirs to build mgmclient before mgmsrv
    to enable --interactive in mgmsrv
ndb/src/mgmsrv/Makefile.am:
  Add --interactive by linking mgmclient
ndb/src/mgmsrv/main.cpp:
  Add --interactive by linking mgmclient

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

Fix ndb_limit, handle cmpDate of length 3
Remove ucs2 test as it requires one to configure --with-extra-charsets


mysql-test/r/ndb_charset.result:
  Remove ucs2 test as it requires one to configure --with-extra-charsets
mysql-test/t/ndb_charset.test:
  Remove ucs2 test as it requires one to configure --with-extra-charsets
ndb/src/common/util/NdbSqlUtil.cpp:
  Fix ndb_limit, handle cmpDate of length 3

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb

removed unused error codes

and Ndb class description;
Doxyfiles: moved detailed class/member descriptions 
to top of generated files.


ndb/docs/doxygen/Doxyfile.ndbapi:
  Moved detailed class descriptions to top of output.
ndb/docs/doxygen/Doxyfile.ndb:
  Moved detailed class descriptions to top of output.
ndb/docs/doxygen/Doxyfile.odbc:
  Moved detailed class descriptions to top of output.
ndb/docs/doxygen/Doxyfile.test:
  Moved detailed class descriptions to top of output.
ndb/include/ndbapi/Ndb.hpp:
  Documentation edits to Cluster Concepts, 
  Ndb Class Description

ndb/include/ndbapi/Ndb.hpp:
  More documentation edits (Adaptive Send).

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

into kite-hub.kitebird.com:/src/extern/MySQL/bk/merge-5.0


sql/set_var.cc:
  Auto merged

  Whack duplicate variable line. (Affects SHOW VARIABLES.)


sql/set_var.cc:
  Whack duplicate variable line. (Affects SHOW VARIABLES.)

  silence picky compiler warning.


sql/sql_select.cc:
  silence picky compiler warning.

into kite-hub.kitebird.com:/src/extern/MySQL/bk/merge-5.0


mysql-test/r/type_float.result:
  Auto merged
sql/field.cc:
  Auto merged

into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1

ndb/include/util/NdbSqlUtil.hpp:
  wl-1442 merge fix 5.0 -> 5.0-ndb

ndb/src/ndbapi/NdbDictionary.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
ndb/include/ndb_constants.h:
  merge 5.0->5.0-ndb
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  merge 5.0->5.0-ndb
ndb/include/ndbapi/NdbDictionary.hpp:
  merge 5.0->5.0-ndb
ndb/include/util/NdbSqlUtil.hpp:
  merge 5.0->5.0-ndb
ndb/src/common/util/NdbSqlUtil.cpp:
  merge 5.0->5.0-ndb

into mysql.com:/home/jwinstead2/mysql-5.0-clean

mysql-test/r/heap.result:
  update test

ndb/include/kernel/signaldata/DictTabInfo.hpp:
  wl-1442 4.1->5.0 merge fixes
ndb/include/ndb_constants.h:
  wl-1442 4.1->5.0 merge fixes
ndb/include/util/NdbSqlUtil.hpp:
  wl-1442 4.1->5.0 merge fixes
ndb/src/common/util/NdbSqlUtil.cpp:
  wl-1442 4.1->5.0 merge fixes

client/mysql.cc:
  Auto merged
mysql-test/r/ndb_index_ordered.result:
  Auto merged
mysql-test/t/ndb_index_ordered.test:
  Auto merged
ndb/src/ndbapi/NdbDictionary.cpp:
  Auto merged
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  merge
ndb/include/ndbapi/NdbDictionary.hpp:
  merge
ndb/include/util/NdbSqlUtil.hpp:
  merge
ndb/src/common/util/NdbSqlUtil.cpp:
  merge
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  merge
sql/ha_ndbcluster.cc:
  merge

into mysql.com:/home/jwinstead2/mysql-5.0-clean


mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/r/sql_mode.result:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged
sql/sql_show.cc:
  Auto merged

into sergbook.mylan:/usr/home/serg/Abk/mysql-4.1

client/mysql.cc:
  few harmless warnings from automated code-checking tools fixed
  cleanup

into mysql.com:/home/jwinstead2/mysql-4.1-clean

  wl-1442 comment for 4.1->5.0


ndb/include/ndb_constants.h:
  wl-1442 comment for 4.1->5.0

mysql-test/r/ndb_index_ordered.result:
  wl-1442 fix Time.  adds new type id 25
mysql-test/t/ndb_index_ordered.test:
  wl-1442 fix Time.  adds new type id 25
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  wl-1442 fix Time.  adds new type id 25
ndb/include/ndbapi/NdbDictionary.hpp:
  wl-1442 fix Time.  adds new type id 25
ndb/include/util/NdbSqlUtil.hpp:
  wl-1442 fix Time.  adds new type id 25
ndb/src/common/util/NdbSqlUtil.cpp:
  wl-1442 fix Time.  adds new type id 25
ndb/src/ndbapi/NdbDictionary.cpp:
  wl-1442 fix Time.  adds new type id 25
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  wl-1442 fix Time.  adds new type id 25
ndb/test/include/NdbSchemaOp.hpp:
  wl-1442 fix Time.  adds new type id 25
ndb/tools/restore/consumer.cpp:
  wl-1442 fix Time.  adds new type id 25
sql/ha_ndbcluster.cc:
  wl-1442 fix Time.  adds new type id 25

about parallelism (Guide section).


ndb/include/ndbapi/Ndb.hpp:
  Fixed some typos and added note about parallelism 
  (Guide section).

into gigan.:C:/cygwin/home/bk/mysql-5.0-ndb


ndb/include/ndbapi/Ndb.hpp:
  Auto merged

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb


ndb/include/ndbapi/Ndb.hpp:
  Auto merged

added example to ndbapi docs


ndb/include/mgmapi/mgmapi.h:
  fixed some mgmapi docs
ndb/include/ndbapi/Ndb.hpp:
  added examples
ndb/src/mgmapi/mgmapi.cpp:
  removed unused parameter

Programmers Guide section.)


ndb/include/ndbapi/Ndb.hpp:
  More fixes/edits (finished NDB Programmers Guide section.)