ndb/src/kernel/ndb-main/Makefile.am:
  Auto merged

configure.in:
  Include mgmapi
ndb/config/type_ndbapi.mk.am:
  remove LDADD from type
ndb/config/type_util.mk.am:
  remove LDADD from type
ndb/src/cw/cpcd/Makefile.am:
  LDADD ndbclient
ndb/src/kernel/ndb-main/Makefile.am:
  Fix LDADD
ndb/src/mgmclient/Makefile.am:
  LDADD ndbclient
ndb/src/mgmsrv/Makefile.am:
  LDADD ndbclient
ndb/test/run-test/Makefile.am:
  LDADD ndbclient

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

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

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


configure.in:
  Auto merged
ndb/src/mgmapi/Makefile.am:
  Auto merged
ndb/src/ndbapi/Makefile.am:
  Auto merged
ndb/src/ndbapi/Ndb.cpp:
  Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
  Auto merged

acconfig.h:
  added switched for shm sci in ndb
acinclude.m4:
  added switched for shm sci in ndb
configure.in:
  added dependency for ndblibs to mysql server
ndb/src/common/transporter/Makefile.am:
  small fix
ndb/src/common/transporter/Transporter.hpp:
  ndb_global for sci and shm defines

into poseidon.(none):/home/tomas/mysql-4.1-ndb

configure.in:
  Added include of mgmapi
ndb/src/common/debugger/signaldata/Makefile.am:
  New files
ndb/src/common/util/Makefile.am:
  Add files
ndb/src/kernel/ndb-main/Makefile.am:
  Use mgmapi
ndb/src/kernel/vm/Makefile.am:
  Use mgmapi
ndb/src/mgmapi/Makefile.am:
  new files
ndb/src/mgmclient/Makefile.am:
  use mgmapi
ndb/src/mgmsrv/Makefile.am:
  use mgmapi

configure.in:
  added NDB_EXTRA_FLAGS
ndb/src/common/transporter/Makefile.am:
  removed SHM in ndb

into mc05.(none):/space2/tomas/mysql-4.1

into poseidon.(none):/home/tomas/mysql-4.1-ndb

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


ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
ndb/Epilogue.mk_old:
  Auto merged
ndb/src/common/debugger/signaldata/Makefile_old:
  Auto merged
ndb/src/common/mgmcommon/Makefile_old:
  Auto merged
ndb/src/common/util/Makefile_old:
  Auto merged
ndb/src/kernel/Makefile_old:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/kernel/ndb-main/Main.cpp:
  Auto merged
ndb/src/kernel/ndb-main/Makefile_old:
  Auto merged
ndb/src/kernel/vm/Makefile_old:
  Auto merged
ndb/src/mgmapi/Makefile_old:
  Auto merged
ndb/src/mgmclient/Makefile_old:
  Auto merged
ndb/src/mgmsrv/Makefile_old:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/ndbapi/ClusterMgr.cpp:
  Auto merged
ndb/src/ndbapi/Makefile_old:
  Auto merged
ndb/src/ndbapi/Ndb.cpp:
  Auto merged
ndb/src/ndbapi/Ndbif.cpp:
  Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
  Auto merged
ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged
ndb/src/ndbapi/TransporterFacade.hpp:
  Auto merged
ndb/test/ndbapi/testDict.cpp:
  Auto merged
ndb/test/ndbapi/testSystemRestart.cpp:
  Auto merged
ndb/test/ndbapi/testTimeout.cpp:
  Auto merged
ndb/test/src/Makefile_old:
  Auto merged

into mc05.(none):/space2/tomas/mysql-4.1


ndb/include/ndbapi/Ndb.hpp:
  Auto merged
ndb/src/kernel/blocks/backup/restore/Restore.hpp:
  Auto merged
ndb/src/kernel/blocks/backup/restore/main.cpp:
  Auto merged
ndb/src/ndbapi/Ndb.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
  Auto merged
ndb/test/ndbapi/testGrepVerify.cpp:
  Auto merged
ndb/tools/listTables.cpp:
  Auto merged

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

into mc05.(none):/space2/tomas/mysql-4.1-ndb-test


BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged

  automake verion problem


configure.in:
  automake verion problem

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


ndb/include/ndbapi/NdbConnection.hpp:
  Auto merged
ndb/include/ndbapi/NdbOperation.hpp:
  Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged

  changed install dir


ndb/test/run-test/Makefile.am:
  changed install dir

ndb/tools/waiter.cpp:
  Rename: ndb/test/tools/waiter.cpp -> ndb/tools/waiter.cpp
configure.in:
  added install dirs for ndb
ndb/Makefile.am:
  ndb headers for install
ndb/config/common.mk.am:
  DEFS_LOC in ndb make
ndb/config/type_ndbapi.mk.am:
  added LDADD=libNDB_API.la default for type_ndbapi
ndb/src/cw/cpcd/Makefile.am:
  changes install dir
ndb/src/kernel/blocks/backup/restore/Makefile.am:
  changes install dir
ndb/src/kernel/ndb-main/Makefile.am:
  changes install dir
ndb/src/mgmapi/Makefile.am:
  changes install dir
ndb/src/mgmclient/Makefile.am:
  changes install dir
ndb/src/mgmsrv/Makefile.am:
  changes install dir
ndb/src/ndbapi/Makefile.am:
  changes install dir
ndb/test/ndbapi/Makefile.am:
  changes install dir
ndb/test/ndbapi/bank/Makefile.am:
  changes install dir
ndb/test/tools/Makefile.am:
  changes install dir
mysql-test/ndb/install_ndbcluster.sh:
  new
mysql-test/ndb/stop_ndbcluster.sh:
  new
ndb/tools/Makefile.am:
  changes install dir

Makefile.am:
  Auto merged
client/mysqldump.c:
  Auto merged
configure.in:
  Auto merged
netware/Makefile.am:
  Auto merged

Docs/manual_toc.html:
  Rename: BitKeeper/deleted/.del-manual_toc.html~f483f2d33d9acb41 -> Docs/manual_toc.html
libmysqld/lib_sql.cc:
  Fixed type of new variables
libmysqld/libmysqld.c:
  Removed duplicate function (allready in libmysql.c)

use opt_net_buffer_length instead of net_buffer_length


Makefile.am:
  netware files should always be in 'make dist'
client/mysqldump.c:
  use opt_net_buffer_length instead of net_buffer_length
configure.in:
  netware files should always be in 'make dist'
netware/Makefile.am:
  netware files should always be in 'make dist'

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

VC++Files/client/mysqlclient.dsp:
  Auto merged
VC++Files/innobase/innobase.dsp:
  Auto merged
include/mysql.h:
  Auto merged
include/mysql_com.h:
  Auto merged
innobase/include/log0log.h:
  Auto merged
innobase/include/log0log.ic:
  Auto merged
innobase/include/mtr0mtr.h:
  Auto merged
innobase/log/log0log.c:
  Auto merged
innobase/log/log0recv.c:
  Auto merged
innobase/que/que0que.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysql_r/Makefile.am:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
tools/mysqlmanager.c:
  Auto merged

  Logging to logging@openlogging.org accepted
compile-pentium-max:
  changed --with-ndbcluster to --without-ndbcluster because it fails on 4.1 builds


BUILD/compile-pentium-max:
  changed --with-ndbcluster to --without-ndbcluster because it fails on 4.1 builds
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

VC++Files/client/mysqlclient.dsp:
  Added missing /D MYSQL_CLIENT
VC++Files/innobase/innobase.dsp:
  Remove not existing file
sql/mysqld.cc:
  Fixed comment

  makefix


configure.in:
  makefix

  new file