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

into mysql.com:/Users/mikron/mycluster

BitKeeper/deleted/.del-Makefile.am~d4e228ebd21fc066:
  Delete: ndb/include/Makefile.am
acinclude.m4:
  static linking of ndbclient into mysqld
configure.in:
  removed ndb/include/Makefile.am + fixed conditional compile of ndb shm, sci
ndb/Makefile.am:
  dist-hook for make distdir in ndb
ndb/config/type_ndbapitest.mk.am:
  use of libndbclient.so in testprograms
ndb/config/type_ndbapitools.mk.am:
  static linking to binary distributed ndb tools
ndb/src/Makefile.am:
  enable libndbclient.so
ndb/src/common/transporter/Makefile.am:
  added support for optional inclusion of shared mem and sci in ndb transporter
ndb/tools/Makefile.am:
  new type for tools which should be statically linked with libndbclient
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1-ndb

BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

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


ndb/src/Makefile_old:
  Auto merged

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

BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

into neptunus.(none):/home/magnus/mysql-4.1

ndb/src/Makefile:
  Compile newtonapi
ndb/src/newtonapi/dba_schema.cpp:
  Use NdbSchemaCon.hpp from newtonapi

ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  New error insert for ndbrequire
ndb/src/kernel/ndb-main/Main.cpp:
  WEXITSTATUS only contains valid value if WIFEXITED

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


configure.in:
  Auto merged

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


configure.in:
  Auto merged

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


configure.in:
  Auto merged

mysql-test/r/variables.result:
  update results after merge
strings/int2str.c:
  Portability fix (using 'char' as a parameter may give a warning)

configure.in:
  Auto merged
innobase/os/os0file.c:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
mysql-test/r/variables.result:
  merge fix

configure.in:
  Ensure that innodb gets system specific CFLAGS and CXXFLAGS
innobase/os/os0file.c:
  Don't use pread/pwrite on systems where these are not working.
  This fixes a bug on HPUX, where InnoDB didn't create the ibdata1 file correctly.

include/config-netware.h:
  Always enable HAVE_COMPRESS on netware
  We can't detect compress in configure on netware because we must use AC_TRY_RUN to detect zlib on other platforms

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

netware/BUILD/nwbootstrap:
  Auto merged

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

mysql-test/t/fulltext.test:
  After merge fix

VC++Files/comp_err/comp_err.dsp:
  Auto merged
VC++Files/sql/mysqld.dsp:
  Auto merged
myisam/ft_boolean_search.c:
  Auto merged
mysql-test/t/fulltext.test:
  Auto merged
myisam/ft_parser.c:
  Keep old code
mysql-test/r/fulltext.result:
  Remove duplicate test from 4.0

netware/BUILD/nwbootstrap:
  Patch from Novell, create the libmysqld.imp file.
netware/mysqld_safe.c:
  Patch from Novell, new option --set-variable.

myisam/ft_boolean_search.c:
  perlify comment

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 mc05.(none):/space2/tomas/mysql-4.1-ndb-test

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