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


configure.in:
  Auto merged
ndb/src/kernel/blocks/backup/restore/Restore.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged

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

  Add missing newlines in fprintfs


innobase/fil/fil0fil.c:
  Add missing newlines in fprintfs

allow deletion of tablespaces whose names contain "'"


innobase/dict/dict0load.c:
  dict_check_tablespaces_or_store_max_id():
  Dynamically allocate memory for file name
innobase/fil/fil0fil.c:
  Dynamically allocate memory for file names
innobase/os/os0file.c:
  os_file_dirname(): allocate slightly less memory
  os_file_create_subdirs_if_needed(): compare more efficiently
innobase/row/row0mysql.c:
  Allow tablespaces with "'" in their names to be deleted
  Display identifiers with ut_print_name() or dict_index_name_print()

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

no AM_MAINTAINER_MODE macro in configure.in


BitKeeper/deleted/.del-compile-pentium-maintainer~3747d5c8d7ec49df:
  Delete: BUILD/compile-pentium-maintainer

mode and one should expect better dependencies tracking.

result": new Item_param member for use in val_str()


sql/item.cc:
  Fix for Bug#3796:
  - return str_value_ptr from val_str to prevent modifications of parameter 
  value.
sql/item.h:
  Fix for bug#3796:
  - Item::val_str() method semantics documented
  - new member of Item_param
tests/client_test.c:
  Test case for bug #3796 added. A few compile-time warnings removed.

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

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

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

removed influence of some tests on other tests


mysql-test/r/multi_update.result:
  removed influence on other tests
mysql-test/r/subselect.result:
  if exists should not be used inside test
mysql-test/t/multi_update.test:
  removed influence on other tests
mysql-test/t/subselect.test:
  if exists should not be used inside test
mysql-test/t/system_mysql_db_fix.test:
  removed influence on other tests

  Added include of ndbout


ndb/src/kernel/blocks/backup/restore/Restore.cpp:
  Added include of ndbout

  Missing  semicolon


sql/ha_ndbcluster.cc:
  Missing  semicolon

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 mysql.com:/home/my/mysql-4.1

Build-tools/Do-compile:
  Auto merged
include/my_global.h:
  Auto merged

Build-tools/Do-compile:
  Added option --config-extra-env
include/my_global.h:
  Cleaned up comment to follow same indentation style as the rest of the code

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

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

sql/handler.h:
  Remove compiler warnings

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

  Improved a comment about HAVE_BROKEN_PREAD: pread() only works on HP-UX 11.0 if one installs kernel patch PHKL_20349 or greater


include/my_global.h:
  Improved a comment about HAVE_BROKEN_PREAD: pread() only works on HP-UX 11.0 if one installs kernel patch PHKL_20349 or greater

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