into mysql.com:/home/wax/mysql/mysql-4.1smemory


sql/mysqld.cc:
  Auto merged

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

decided for fixed size buffers in LogHandler repeated messages


mysql-test/ndb/basic.result:
  updated ndb test
ndb/include/logger/LogHandler.hpp:
  decided for fixed size buffers
ndb/include/logger/Logger.hpp:
  decided for fixed size buffers
ndb/src/common/logger/LogHandler.cpp:
  decided for fixed size buffers
ndb/src/common/logger/Logger.cpp:
  decided for fixed size buffers

ndb/src/common/transporter/Transporter.hpp:
  fixed small error

into mysql.com:/home/dlenev/src/mysql-4.1-smfix

STR_TO_DATE() function if there is another format specifier after %f 
in format string". Also small cleanup of STR_TO_DATE() implementation.
(After review version.)


mysql-test/r/date_formats.result:
  Added test for small bug in STR_TO_DATE() implementation which caused
  microseconds to be gobbled from string result of this function, if
  there was another specifier after %f in format string.
mysql-test/t/date_formats.test:
  Added test for small bug in STR_TO_DATE() implementation which caused
  microseconds to be gobbled from string result of this function, if
  there was another specifier after %f in format string.
sql/item_timefunc.cc:
  Small cleanup of str_to_date() implementation.
    Renamed check_result_type() to less ambigous get_date_time_result_type()
    and made it static. Also added handling of %X,%x,%V,%v to this function.
    Fixed small bug in it which caused microseconds to be gobbled if there
    was some other specifiers after %f.
    Cleaned up comments a bit.

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

changed name of g_eventLogger so it can be used in TransporterRegistry and is the same as in the kernel


ndb/include/ndbapi/ndb_cluster_connection.hpp:
  changed return type of no_ndb_nodes
ndb/include/transporter/TransporterRegistry.hpp:
  added connect_server method to TransporterRegistry
ndb/include/util/ndb_opts.h:
  set shared memory usage as _no_ default in 4.1
ndb/src/common/transporter/Makefile.am:
  added -I flags for EventLogger.hpp
ndb/src/common/transporter/SCI_Transporter.cpp:
  setting transporter type
ndb/src/common/transporter/SHM_Transporter.cpp:
  setting transporter type
ndb/src/common/transporter/TCP_Transporter.cpp:
  setting transporter type
ndb/src/common/transporter/Transporter.cpp:
  added event logger
  added type handling in transporter
  added verification of transporter type compatability
ndb/src/common/transporter/Transporter.hpp:
  setting transporter type
ndb/src/common/transporter/TransporterRegistry.cpp:
  moved server-client transporter negotiation to own method connect_server()
  added verification of transporter compatability
ndb/src/kernel/main.cpp:
  changed which events are logged
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  added g_eventLogger
sql/mysqld.cc:
  set shared memory usage as _no_ default in 4.1

into mysql.com:/space/pekka/ndb/version/my41

ndb/test/ndbapi/testBlobs.cpp:
  use Ndb_cluster_connection
ndb/test/ndbapi/testOIBasic.cpp:
  use Ndb_cluster_connection

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

ndb/src/ndbapi/Ndbinit.cpp:
  Fix bug in backward compatility code (for our test programs)

into mysql.com:/space/pekka/ndb/version/my41


ndb/src/ndbapi/NdbConnection.cpp:
  Auto merged

mysql-test/r/ndb_blob.result:
  bug#7340 fix
mysql-test/t/ndb_blob.test:
  bug#7340 fix
ndb/src/ndbapi/NdbConnection.cpp:
  bug#7340 fix
ndb/src/ndbapi/NdbOperationDefine.cpp:
  bug#7340 fix

See mysqldump.test comments for more details

  Add a comment that no InnoDB table lock is now acquired in LOCK TABLES if AUTOCOMMIT=1. This helps to avoid deadlocks when porting old MyISAM applications to InnoDB.


sql/ha_innodb.cc:
  Add a comment that no InnoDB table lock is now acquired in LOCK TABLES if AUTOCOMMIT=1. This helps to avoid deadlocks when porting old MyISAM applications to InnoDB.

into hundin.mysql.fi:/home/heikki/mysql-4.1


sql/ha_innodb.cc:
  Auto merged

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

ndb/test/run-test/main.cpp:
  adapt to changes in Logger

  If AUTOCOMMIT=1, do not acquire an InnoDB table lock in LOCK TABLES; this makes porting of old MyISAM applications to InnoDB easier, since in that mode InnoDB table locks caused deadlocks very easily


sql/ha_innodb.cc:
  If AUTOCOMMIT=1, do not acquire an InnoDB table lock in LOCK TABLES; this makes porting of old MyISAM applications to InnoDB easier, since in that mode InnoDB table locks caused deadlocks very easily

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

    use configured hostnames for SHM transporter setup


ndb/include/transporter/TransporterDefinitions.hpp:
  added configuration hostnames to SHM config struct
ndb/src/common/mgmcommon/IPCConfig.cpp:
  added configuration hostnames to SHM config struct
ndb/src/common/transporter/TransporterRegistry.cpp:
  added configuration hostnames to SHM config struct
  use configured hostnames for SHM transporter setup

into hundin.mysql.fi:/home/heikki/mysql-4.1


configure.in:
  SCCS merged
innobase/os/os0file.c:
  SCCS merged

  ifdef on version prior to 5.0


ndb/src/mgmsrv/main.cpp:
  ifdef on version prior to 5.0

  Put back accidentally removed undef and remove a debug def


innobase/os/os0file.c:
  Put back accidentally removed undef and remove a debug def

  Fix InnoDB bug: on HP-UX, with a 32-bit binary, InnoDB was only able to read or write <= 2 GB files; the reason was that InnoDB treated the return value of lseek() as a 32-bit integer; lseek was used on HP-UX-11 as a replacement for pread() and pwrite() because HAVE_BROKEN_PREAD was defined on that platform


innobase/os/os0file.c:
  Fix InnoDB bug: on HP-UX, with a 32-bit binary, InnoDB was only able to read or write <= 2 GB files; the reason was that InnoDB treated the return value of lseek() as a 32-bit integer; lseek was used on HP-UX-11 as a replacement for pread() and pwrite() because HAVE_BROKEN_PREAD was defined on that platform

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

  NdbApi.hpp to include ndb_inti.h and ndb_cluster_connecion.hpp


ndb/include/ndbapi/NdbApi.hpp:
  NdbApi.hpp to include ndb_inti.h and ndb_cluster_connecion.hpp

  Check that the requested storage engine is enabled.

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

    added missing copyright text
    moved ndb_init things to separate header file
    removed ndb_global include
    documented cluster connection class
    moved internal constants to NdbImpl.hpp class
    changed wait_until_ready behaviour somewhat


ndb/config/type_ndbapitest.mk.am:
  corrected -I flag
ndb/include/Makefile.am:
  added ndb_init.h to distribution
ndb/include/ndb_global.h.in:
  added copyright text
  moved ndb_init things to separate header file
ndb/include/ndbapi/NdbBlob.hpp:
  moved error codes and internal constants to NdbBlobImpl.hpp
ndb/include/ndbapi/NdbReceiver.hpp:
  removed ndb_global include
ndb/include/ndbapi/ndb_cluster_connection.hpp:
  documented cluster connection class
  changed wait_until_ready behaviour somewhat
ndb/src/ndbapi/Ndb.cpp:
  documented cluster connection class
  changed wait_until_ready behaviour somewhat
ndb/src/ndbapi/NdbBlob.cpp:
  moved internal constants to NdbImpl.hpp class
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  moved internal constants to NdbImpl.hpp class
ndb/src/ndbapi/NdbOperationInt.cpp:
  changed includes
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  changed wait_until_ready behaviour somewhat
ndb/test/ndbapi/testBlobs.cpp:
  use impl class to get constants

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

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

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


sql/item_func.cc:
  Auto merged

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

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


libmysqld/lib_sql.cc:
  Auto merged