ndb/include/kernel/NodeInfo.hpp:
  alligning node numbering
ndb/include/kernel/NodeState.hpp:
  added connected nodes to NodeState
ndb/include/kernel/signaldata/ApiRegSignalData.hpp:
  moved to NodeState
ndb/include/mgmapi/mgmapi.h:
  alligning node numbering
ndb/include/mgmapi/mgmapi_config_parameters.h:
  new config port_base param on system
ndb/include/util/Bitmask.hpp:
  POD Bitmask
ndb/include/util/SocketAuthenticator.hpp:
  SocketAut fix
ndb/src/common/mgmcommon/ConfigInfo.cpp:
  added new config param
ndb/src/common/transporter/Transporter.cpp:
  alligning node numbering
ndb/src/common/transporter/TransporterRegistry.cpp:
  alligning node numbering
ndb/src/common/util/SocketAuthenticator.cpp:
  alligning node numbering
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  moved connected nodes to NodeState
ndb/src/mgmsrv/MgmtSrvr.cpp:
  allocation and delallocation of resources in mgmsrvr
  connected bitmask on each node status together with reserved nodes
  that are reserved as long as session is active
  + check that hostname is same as client name
ndb/src/mgmsrv/MgmtSrvr.hpp:
  allocation and delallocation of resources in mgmsrvr
  connected bitmask on each node status together with reserved nodes
  that are reserved as long as session is active
ndb/src/mgmsrv/Services.cpp:
  added destuctor for apisession
ndb/src/mgmsrv/Services.hpp:
  ..
ndb/src/mgmsrv/main.cpp:
  print node id
ndb/src/ndbapi/ClusterMgr.cpp:
  ..
ndb/src/ndbapi/ClusterMgr.hpp:
  ..

into poseidon.bredbandsbolaget.se:/home/tomas/mysql-4.1-ndb


ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
ndb/src/kernel/main.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/ndbapi/ClusterMgr.cpp:
  Auto merged
ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged
ndb/src/ndbapi/TransporterFacade.hpp:
  Auto merged

into poseidon.bredbandsbolaget.se:/home/tomas/mysql-4.1-ndb-merge

ndb/include/kernel/signaldata/ApiRegSignalData.hpp:
  Added info about connected nodes to ApiRegConf
ndb/include/mgmapi/mgmapi.h:
  New mgmapi command to get nodeid dynamically
ndb/include/mgmapi/mgmapi_config_parameters.h:
  New config param to specify port on for transporter setup
ndb/include/mgmcommon/ConfigRetriever.hpp:
  added notetype to getConfig
ndb/include/portlib/NdbTCP.h:
  small detail
ndb/include/transporter/TransporterRegistry.hpp:
  changed performstates and interface to connect/disconnect transporters
  added TransporterService for transporter setup
  changed model for setting up transporters
ndb/src/common/mgmcommon/ConfigInfo.cpp:
  removed some config params as mandatory
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  added dynamic alloc of nodeid
ndb/src/common/mgmcommon/LocalConfig.cpp:
  added default localhost:2200 and dynamic id
ndb/src/common/transporter/TCP_Transporter.cpp:
  moved TCP hostname stuff from TCP_Transporter to parent class Transporter
  changed TCP connection setup to use just one port for all transporters
ndb/src/common/transporter/TCP_Transporter.hpp:
  moved TCP hostname stuff from TCP_Transporter to parent class Transporter
  changed TCP connection setup to use just one port for all transporters
ndb/src/common/transporter/Transporter.cpp:
  moved TCP hostname stuff from TCP_Transporter to parent class Transporter
  changed TCP connection setup to use just one port for all transporters
ndb/src/common/transporter/Transporter.hpp:
  moved TCP hostname stuff from TCP_Transporter to parent class Transporter
  changed TCP connection setup to use just one port for all transporters
ndb/src/common/transporter/TransporterRegistry.cpp:
  changed performstates and interface to connect/disconnect transporters
  added TransporterService for transporter setup
  changed model for setting up transporters
ndb/src/common/util/Makefile.am:
  New SocketAuthenticator
ndb/src/common/util/SocketServer.cpp:
  small detail
ndb/src/kernel/Makefile.am:
  small detail
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  new interface to performstates + cleanup
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  changed signal ApiRegConf
ndb/src/kernel/vm/ThreadConfig.cpp:
  changed naming
ndb/src/mgmapi/mgmapi.cpp:
  Use new Socket client
  New methid for allocating dynamic id
ndb/src/mgmsrv/MgmtSrvr.cpp:
  moved port setup from main.cpp to MgmtSrvr
  new method getNextFreeNodeId
ndb/src/mgmsrv/MgmtSrvr.hpp:
  ..
ndb/src/mgmsrv/Services.cpp:
  allocate new nodeid
ndb/src/mgmsrv/Services.hpp:
  ..
ndb/src/mgmsrv/main.cpp:
  moved setup port to MgmtSrvr.cpp
  Rearranged setup order
ndb/src/ndbapi/ClusterMgr.cpp:
  new API_REGCONF
ndb/src/ndbapi/ClusterMgr.hpp:
  bitmask to hold connected nodes
ndb/src/ndbapi/TransporterFacade.cpp:
  New transporter connect
ndb/src/ndbapi/TransporterFacade.hpp:
  removed function not used
ndb/src/kernel/main.cpp:
  new transporter setup

into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-tz-am

mysql_tzinfo_to_sql converter was moved to extra/ directory and its build was made 
compatible with older automake versions.


extra/Makefile.am:
  mysql_tzinfo_to_sql converter was moved to extra/ directory and its build was made 
  compatible with older automake versions.
sql/Makefile.am:
  mysql_tzinfo_to_sql converter was moved to extra/ directory and its build was made
  compatible with older automake versions.
BitKeeper/etc/ignore:
  Added extra/tztime.cc extra/mysql_tzinfo_to_sql to the ignore list

test suite fixed.


libmysql/libmysql.c:
  - fixed a bug in protocol -> host integer conversions in send_data_str
tests/client_test.c:
  Fixes to make client_test run on 64 bit Sun:
  - strlen() doesn't accept NULL input
  - Sun is high byte first, so we can't store bind 32-bit variables to 16-bit
  to MYSQL_TYPE_SHORT/TINY

ndb/src/ndbapi/NdbScanOperation.cpp:
  Extra printout if DEBUG_NEXT_RESULT
  Set theError.code so one can't call nextResult after it has once returned 1
ndb/test/ndbapi/ScanFunctions.hpp:
  Update testcases
ndb/test/ndbapi/testScan.cpp:
  ScanWitoutOpenScan isn't really relevent anymore

into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-bg4200


sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

Now ESCAPE in LIKE will accept not only string literal but constant 
delimited expression.


mysql-test/r/func_like.result:
  Added test for bug# 4200 "Parse error on LIKE ESCAPE with parameter binding"
mysql-test/t/func_like.test:
  Added test for bug# 4200 "Parse error on LIKE ESCAPE with parameter binding"
sql/item_cmpfunc.cc:
  Added support for accepting of constant delimited expression as ESCAPE argument to
  Item_func_like.
sql/item_cmpfunc.h:
  Now ESCAPE clause in LIKE will accept not only string literal but constant delimited 
  expression. Thus added member to Item_func_like for storing Item corresponding to this
  expression and changed third argument of cons to be Item* instead of char*.
sql/sql_help.cc:
  Item_func_like now accepts Item* as third argument.
sql/sql_yacc.yy:
  Now ESCAPE clause of LIKE accepts not only string literal but constant delimited expression
  (the most important case is prepared statement parameter of course).

into sanja.is.com.ua:/home/bell/mysql/bk/work-regexp-4.1


sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged

into sanja.is.com.ua:/home/bell/mysql/bk/work-insert-4.1

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

  ./configure --with-charset=binary
  is now possible.


configure.in:
  --with-charset-binary is now possible.

mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/subselect.test:
  SCCS merged

mysql-test/r/subselect.result:
  prepare statement test added
mysql-test/t/subselect.test:
  prepare statement test added

into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b4102

sql/item.h:
  Auto merged

ndb/src/common/debugger/signaldata/ScanTab.cpp:
  Improved printer
ndb/src/ndbapi/NdbScanOperation.cpp:
  Don't fetch if we have result

sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
mysql-test/r/subselect.result:
  SCCS merged
mysql-test/t/subselect.test:
  SCCS merged

into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-tz-cleanup

on many platforms (the other option was providing portable setenv() replacement).


sql/Makefile.am:
  Removed building of test_time since it was not needed/used really and caused problems on 
  many platforms.

  Drop t2 in the beginning.
  ,


mysql-test/r/auto_increment.result:
  Drop t2 in the beginning.
  ,
mysql-test/t/auto_increment.test:
  Drop t2 in the beginning.
  ,

 statement": check that statement is not null when accessing it's name.


tests/client_test.c:
  A test case for bug#4236

into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b4198


sql/sql_select.cc:
  Auto merged

into mysql.com:/dbdata/psergey/mysql-4.1-root

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

   requested


Build-tools/Do-compile:
   - explicitely enable libedit, when readline is not requested

into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-tz-cleanup

Now we are using time zone abbreviations in debug builds or in utlities only.
Tried to remove warnings generated by compiler by using more proper types for
members of time zone describing structures. Removed unused variables. 
Fixed test_time to be able to build on FreeBSD without much problems.
Portability fix: resolved ambiguity of abs() function.

into mysql.com:/home/mysql_src/mysql-4.1-874

(enum_shutdown_level is going to replace enum killed_state in 5.0).


VC++Files/winmysqladmin/mysql_com.h:
  putting in place the 2 types of KILL of 5.0
include/mysql_com.h:
  putting in place the two types of KILL of 5.0

Fix debug require in TC


ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Remove debug assert
ndb/test/src/HugoAsynchTransactions.cpp:
  Fix testBasicAsynch

ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  BUG#4230
  Solution: always reply when exeute bit is set
ndb/test/ndbapi/testTimeout.cpp:
  test for BUG#4230

sql/item_func.cc:
  Unused variable 'thd' removed.
sql/item_subselect.cc:
  Unused variable 'type' removed.
sql/slave.cc:
  Unused variable 'return_val' removed.
sql/sql_derived.cc:
  Unused variable 'is_subsel' removed.
sql/sql_parse.cc:
  Unused variables 'pstr' and 'create_info' removed.
sql/sql_prepare.cc:
  Unused variable 'res' removed.
sql/time.cc:
  Unused variable 'str_begin' removed.