BitKeeper/deleted/.del-stop_ndbcluster.sh~b3b9e9505384aca1:
  Delete: mysql-test/ndb/stop_ndbcluster.sh
mysql-test/mysql-test-run.sh:
  collapsed ndb start/stop scripts
mysql-test/ndb/Makefile.am:
  collapsed ndb start/stop scripts
mysql-test/ndb/ndbcluster.sh:
  collapsed ndb start/stop scripts + ndb bin name changes
ndb/src/kernel/Makefile.am:
  ndb bin name changes
ndb/src/kernel/blocks/backup/restore/Makefile.am:
  ndb bin name changes
ndb/src/mgmclient/Makefile.am:
  ndb bin name changes
ndb/src/mgmsrv/Makefile.am:
  ndb bin name changes
ndb/tools/Makefile.am:
  ndb bin name changes

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

Fixed bug introduced with upgrade code

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

  Stop InnoDB crash recovery if an .ibd file for a table exists in a database directory, but we cannot access it.


innobase/fil/fil0fil.c:
  Stop InnoDB crash recovery if an .ibd file for a table exists in a database directory, but we cannot access it.

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


configure.in:
  Auto merged

ndb/src/kernel/Main.cpp:
  Rename: ndb/src/kernel/ndb-main/Main.cpp -> ndb/src/kernel/Main.cpp
ndb/src/kernel/SimBlockList.cpp:
  Rename: ndb/src/kernel/ndb-main/SimBlockList.cpp -> ndb/src/kernel/SimBlockList.cpp
BitKeeper/deleted/.del-Makefile.am~dbb6038d7163a54d:
  Delete: ndb/src/kernel/ndb-main/Makefile.am
BitKeeper/deleted/.del-Makefile_old~1f37e763ba5d06d0:
  Delete: ndb/src/kernel/ndb-main/Makefile_old
ndb/old_files/BinDist.sh:
  Rename: ndb/BinDist.sh -> ndb/old_files/BinDist.sh
ndb/old_files/Defs.mk:
  Rename: ndb/Defs.mk -> ndb/old_files/Defs.mk
ndb/old_files/Makefile:
  Rename: ndb/Makefile_old -> ndb/old_files/Makefile
ndb/old_files/SrcDist.sh:
  Rename: ndb/SrcDist.sh -> ndb/old_files/SrcDist.sh
ndb/old_files/configure:
  Rename: ndb/configure_old -> ndb/old_files/configure
ndb/old_files/Epilogue.mk:
  Rename: ndb/Epilogue.mk_old -> ndb/old_files/Epilogue.mk
ndb/config/old_files/Defs.DEBUG.mk:
  Rename: ndb/config/Defs.DEBUG.mk -> ndb/config/old_files/Defs.DEBUG.mk
ndb/config/old_files/Defs.HPUX.HPPA.GCC.mk:
  Rename: ndb/config/Defs.HPUX.HPPA.GCC.mk -> ndb/config/old_files/Defs.HPUX.HPPA.GCC.mk
ndb/config/old_files/Defs.IBMAIX.POWERPC.GCC.mk:
  Rename: ndb/config/Defs.IBMAIX.POWERPC.GCC.mk -> ndb/config/old_files/Defs.IBMAIX.POWERPC.GCC.mk
ndb/config/old_files/Defs.LINUX.x86.GCC.mk:
  Rename: ndb/config/Defs.LINUX.x86.GCC.mk -> ndb/config/old_files/Defs.LINUX.x86.GCC.mk
ndb/config/old_files/Defs.LINUX.x86.ICC.mk:
  Rename: ndb/config/Defs.LINUX.x86.ICC.mk -> ndb/config/old_files/Defs.LINUX.x86.ICC.mk
ndb/config/old_files/Defs.LINUX.x86_64.GCC.mk:
  Rename: ndb/config/Defs.LINUX.x86_64.GCC.mk -> ndb/config/old_files/Defs.LINUX.x86_64.GCC.mk
ndb/config/old_files/Defs.MACOSX.POWERPC.GCC.mk:
  Rename: ndb/config/Defs.MACOSX.POWERPC.GCC.mk -> ndb/config/old_files/Defs.MACOSX.POWERPC.GCC.mk
ndb/config/old_files/Defs.OSE.PPC750.DIAB.mk:
  Rename: ndb/config/Defs.OSE.PPC750.DIAB.mk -> ndb/config/old_files/Defs.OSE.PPC750.DIAB.mk
ndb/config/old_files/Defs.RELEASE.mk:
  Rename: ndb/config/Defs.RELEASE.mk -> ndb/config/old_files/Defs.RELEASE.mk
ndb/config/old_files/Defs.RELEASE_TRACE.mk:
  Rename: ndb/config/Defs.RELEASE_TRACE.mk -> ndb/config/old_files/Defs.RELEASE_TRACE.mk
ndb/config/old_files/Defs.SIMCELLO.SOFTOSE.GCC.mk:
  Rename: ndb/config/Defs.SIMCELLO.SOFTOSE.GCC.mk -> ndb/config/old_files/Defs.SIMCELLO.SOFTOSE.GCC.mk
ndb/config/old_files/Defs.SOFTOSE.SPARC.GCC.mk:
  Rename: ndb/config/Defs.SOFTOSE.SPARC.GCC.mk -> ndb/config/old_files/Defs.SOFTOSE.SPARC.GCC.mk
ndb/config/old_files/Defs.SOLARIS.SPARC.FORTE6.mk:
  Rename: ndb/config/Defs.SOLARIS.SPARC.FORTE6.mk -> ndb/config/old_files/Defs.SOLARIS.SPARC.FORTE6.mk
ndb/config/old_files/Defs.SOLARIS.SPARC.GCC.mk:
  Rename: ndb/config/Defs.SOLARIS.SPARC.GCC.mk -> ndb/config/old_files/Defs.SOLARIS.SPARC.GCC.mk
ndb/config/old_files/Defs.SOLARIS.SPARC_64.GCC.mk:
  Rename: ndb/config/Defs.SOLARIS.SPARC_64.GCC.mk -> ndb/config/old_files/Defs.SOLARIS.SPARC_64.GCC.mk
ndb/config/old_files/Defs.SOLARIS6.SPARC.GCC.mk:
  Rename: ndb/config/Defs.SOLARIS6.SPARC.GCC.mk -> ndb/config/old_files/Defs.SOLARIS6.SPARC.GCC.mk
ndb/config/old_files/Defs.TRU64X.ALPHA.GCC.mk:
  Rename: ndb/config/Defs.TRU64X.ALPHA.GCC.mk -> ndb/config/old_files/Defs.TRU64X.ALPHA.GCC.mk
ndb/config/old_files/Defs.WIN32.x86.VC7.mk:
  Rename: ndb/config/Defs.WIN32.x86.VC7.mk -> ndb/config/old_files/Defs.WIN32.x86.VC7.mk
ndb/config/old_files/acinclude.m4:
  Rename: ndb/config/acinclude.m4 -> ndb/config/old_files/acinclude.m4
ndb/config/old_files/Makefile.am:
  Rename: ndb/config/Makefile.am_old -> ndb/config/old_files/Makefile.am
ndb/config/old_files/GuessConfig.sh:
  Rename: ndb/config/GuessConfig.sh_old -> ndb/config/old_files/GuessConfig.sh
ndb/config/old_files/configure.in:
  Rename: ndb/config/configure.in -> ndb/config/old_files/configure.in
ndb/config/old_files/config.h.in:
  Rename: ndb/config/config.h.in -> ndb/config/old_files/config.h.in
ndb/old_files/README:
  Rename: ndb/README -> ndb/old_files/README
ndb/old_files/mysqlclusterenv.sh:
  Rename: ndb/mysqlclusterenv.sh -> ndb/old_files/mysqlclusterenv.sh
ndb/old_files/env.sh:
  Rename: ndb/env.sh -> ndb/old_files/env.sh
BitKeeper/deleted/.del-Makefile~650473b0dabb331b:
  Delete: ndb/src/scripts/Makefile
ndb/src/old_files/ndbbaseclient/Makefile:
  mvdir
ndb/src/old_files/ndbbaseclient/ndbbaseclient_dummy.cpp:
  mvdir
ndb/src/old_files/ndbclient/Makefile:
  mvdir
ndb/src/old_files/ndbclient/ndbclient_dummy.cpp:
  mvdir
ndb/src/old_files/Makefile:
  Rename: ndb/src/Makefile_old -> ndb/src/old_files/Makefile
acinclude.m4:
  added ndb configure options
configure.in:
  moved lots of stuff for ndb over to Makefile.ams and added some config opt for ndb
mysql-test/ndb/install_ndbcluster.sh:
  adopt to new ndb install
mysql-test/ndb/stop_ndbcluster.sh:
  adopt to new ndb install
ndb/Makefile.am:
  moved some things to include/Makefile.am
ndb/config/common.mk.am:
  moved some things from configure.in
ndb/config/type_kernel.mk.am:
  moved some things from configure.in
ndb/config/type_mgmapiclient.mk.am:
  moved some things from configure.in
ndb/config/type_ndbapi.mk.am:
  moved some things from configure.in
ndb/config/type_ndbapiclient.mk.am:
  moved some things from configure.in
ndb/config/type_ndbapitest.mk.am:
  moved some things from configure.in
ndb/config/type_ndbapitools.mk.am:
  moved some things from configure.in
ndb/config/type_util.mk.am:
  moved some things from configure.in
ndb/src/Makefile.am:
  .
ndb/src/common/portlib/Makefile.am:
  fix for make distdir
ndb/src/cw/cpcd/Makefile.am:
  added configurable ldflags
ndb/src/kernel/Makefile.am:
  moved up ndb-main one level
ndb/src/kernel/blocks/backup/restore/Makefile.am:
  added configurable ldflags
ndb/src/kernel/blocks/suma/Makefile.am:
  fixed error
ndb/src/kernel/error/Makefile.am:
  fix error
ndb/src/kernel/vm/Makefile.am:
  fix error
ndb/src/mgmapi/Makefile.am:
  removed libMGM_API
ndb/src/mgmclient/Makefile.am:
  added configurable ldflags
ndb/src/mgmsrv/Makefile.am:
  added configurable ldflags
ndb/src/ndbapi/Makefile.am:
  removed libNDB_API
ndb/test/Makefile.am:
  added optional build of ndbapi tests
ndb/tools/Makefile.am:
  added configurable ldflags
ndb/include/Makefile.am:
  fixed missing .h files in make distdir
scripts/make_binary_distribution.sh:
  updated for ndb and new make

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

sql/sql_acl.cc:
  cleanup

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


acconfig.h:
  Auto merged
configure.in:
  Auto merged

libmysqld/Makefile.am:
  Removed define that is now defined by configure and my_global.h
mysql-test/r/func_gconcat.result:
  Fixed test result after removing end space
sql/share/romanian/errmsg.txt:
  Fixed wrong error message
sql/sql_insert.cc:
  Removed compiler warning

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


configure.in:
  Auto merged

Fixed serbian error messages
Fix for windows regarding changed variable name


configure.in:
  Update version number
  Added serbian error messages
libmysqld/libmysqld.def:
  Fix changed variable names
mysql-test/t/func_gconcat.test:
  remove some \r
sql/share/serbian/errmsg.txt:
  Added missing error messages

into deer.(none):/home/hf/work/mysql-4.1.ftr


sql/mysqld.cc:
  Auto merged

into deer.(none):/home/hf/work/mysql-4.1.ftr


configure.in:
  Auto merged
include/my_global.h:
  Auto merged
sql/mysqld.cc:
  Auto merged

into deer.(none):/home/hf/work/mysql-4.1.3412

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

  Do not lock raw devices or files opened for read only


innobase/os/os0file.c:
  Do not lock raw devices or files opened for read only

  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

empty recordset where some records should be found)


sql/ha_myisam.cc:
  Code simplified with vio_ok()
sql/mysqld.cc:
  vio_ok used
sql/slave.cc:
  vio_ok used
sql/sql_class.cc:
  Here is the place of the error - we should not examine net.vio in
  embedded library
sql/sql_class.h:
  method added to always return TRUE in embedded library, and to
  sheck thd.net.vio otherwise
sql/sql_show.cc:
  code simplified with vio_ok()

  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