BitKeeper/etc/logging_ok:
  auto-union
ndb/include/kernel/NodeState.hpp:
  Auto merged
ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged
ndb/include/util/Bitmask.hpp:
  Auto merged
ndb/src/common/debugger/EventLogger.cpp:
  Auto merged
ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
ndb/src/common/util/SocketServer.cpp:
  Auto merged
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/kernel/main.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
ndb/src/kernel/error/ErrorReporter.hpp:
  Auto merged
ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
ndb/src/mgmclient/CpcClient.cpp:
  Auto merged
ndb/src/mgmsrv/Services.cpp:
  Auto merged
ndb/src/ndbapi/Ndb.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
  Auto merged
ndb/test/include/NDBT_Table.hpp:
  Auto merged
ndb/test/include/NDBT_Test.hpp:
  Auto merged
ndb/test/run-test/main.cpp:
  Auto merged
ndb/test/src/HugoOperations.cpp:
  Auto merged
ndb/test/src/HugoTransactions.cpp:
  Auto merged
ndb/test/src/NDBT_Tables.cpp:
  Auto merged
ndb/test/src/NDBT_Test.cpp:
  Auto merged
ndb/test/src/NdbRestarter.cpp:
  Auto merged
ndb/tools/waiter.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged

sql/ha_ndbcluster.cc:
  Fix duplicate declaration

into serg.mylan:/usr/home/serg/Abk/mysql-4.1

Mainly explicit template instantiations


ndb/src/common/debugger/signaldata/SignalDataPrint.cpp:
  Explicit template instantiations
ndb/src/common/util/SocketServer.cpp:
  Explicit template instantiations
ndb/src/kernel/blocks/backup/BackupInit.cpp:
  Explicit template instantiations
ndb/src/kernel/blocks/dbutil/DbUtil.cpp:
  Explicit template instantiations
ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
  Explicit template instantiations
ndb/src/kernel/vm/ArrayPool.hpp:
  Only define print if #VM_TRACE
ndb/src/mgmclient/CpcClient.cpp:
  Explicit template instantiations
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Explicit template instantiations
ndb/test/include/NDBT_Table.hpp:
  Fully qualified type name
ndb/test/include/NDBT_Test.hpp:
  Add destructors (so that v-table isn't empty)
ndb/test/run-test/main.cpp:
  Explicit template instantiations
ndb/test/src/HugoOperations.cpp:
  Explicit template instantiations
ndb/test/src/HugoTransactions.cpp:
  Explicit template instantiations
ndb/test/src/NDBT_Test.cpp:
  Explicit template instantiations
ndb/test/src/NdbRestarter.cpp:
  Explicit template instantiations
ndb/test/tools/cpcc.cpp:
  Explicit template instantiations

"export A=var" is bash feature
instead do "A=var; export A"

Fix error printout


ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Fix init scan frag record
ndb/src/mgmsrv/main.cpp:
  Fix error printout

into mysql.com:/orca/space/pekka/ndb/version/my41-34x

  compile fix for gcc-3.4.x


ndb/include/util/Bitmask.hpp:
  compile fix for gcc-3.4.x

into hundin.mysql.fi:/home/marko/l/mysql-4.1

into mysql.com:/Users/mikron/mysql-4.1

  Restore accidentally deleted comment of fil_create_directory_for_tablename()


innobase/fil/fil0fil.c:
  Restore accidentally deleted comment of fil_create_directory_for_tablename()

  ha_innobase::create(): pass the query string as UTF-8
  to row_table_add_foreign_constraints()  (Bug #4649)


sql/ha_innodb.cc:
  ha_innobase::create(): pass the query string as UTF-8
  to row_table_add_foreign_constraints()  (Bug #4649)

into mysql.com:/Users/mikron/mysql-4.1

into serg.mylan:/usr/home/serg/Abk/mysql-4.1

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

   flags to enable static linking (to avoid having a shared lib
   dependency in the Linux RPMs)
 - Disabled OpenSSL in the Max RPM


sql/Makefile.am:
   - added the MYSQL_EXTRA_LDFLAGS to the mysql_tzinfo_to_sql link
     flags to enable static linking (to avoid having a shared lib
     dependency in the Linux Server RPMs)
support-files/mysql.spec.sh:
   - Disable OpenSSL in the Max RPM

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

into mysql.com:/Users/mikron/mysql-4.1


ndb/src/ndbapi/Ndblist.cpp:
  Auto merged
ndb/test/include/HugoTransactions.hpp:
  Auto merged
ndb/test/src/HugoTransactions.cpp:
  Auto merged

n**2 times in closeTransaction where n is number of signals
sent in transaction. n can easily become 250.000 in a large
transaction.

mysql-test/r/ps_6bdb.result:
  Updated results.

into serg.mylan:/usr/home/serg/Abk/mysql-4.1

into mysql.com:/home/mysql_src/mysql-4.1-1717

sql-common/my_time.c:
  superfluous ; which caused a problem with gcc 2.95

into serg.mylan:/usr/home/serg/Abk/mysql-4.1

mysql-test/r/auto_increment.result:
  bug test
mysql-test/t/auto_increment.test:
  bug test
sql/sql_base.cc:
  cleanup

into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-bg4492

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

into mysql.com:/home/mysql_src/mysql-4.1-1717

if slave resumes at BEGIN).


mysql-test/t/rpl_relayrotate.test:
  require InnoDB (does not make sense without InnoDB)

into hegel.txg:/home/miguel/bk/mysql-4.1

into mysql.com:/home/mysql_src/mysql-4.1-1717


client/mysqlbinlog.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged

WL#1580: --start-datetime, --stop-datetime, --start-position (alias for --position) and --stop-position
options for mysqlbinlog, with a test file.
This enables user to say "recover my database to how it was this morning at 10:30"
(mysqlbinlog "--stop-datetime=2003-07-29 10:30:00").
Using time functions into client/ made me move them out of sql/ into sql-common/.
+ (small) fix for BUG#4507 "mysqlbinlog --read-from-remote-server sometimes
cannot accept 2 binlogs" (that is, on command line).


client/client_priv.h:
  new options for mysqlbinlog
client/mysqlbinlog.cc:
  WL#1580: --start-datetime, --stop-datetime, --start-position (alias for --position) and --stop-position.
  (small) fix for BUG#4507 "mysqlbinlog --read-from-remote-server sometimes
   cannot accept 2 binlogs".
include/my_time.h:
  importing time functions so that client/ files can use them.
include/mysql_time.h:
  importing time types so that client/ files can use them.
sql-common/my_time.c:
  importing time functions so that client/ files can use them.
sql/mysql_priv.h:
  moving time functions out of sql/ into sql-common/
sql/time.cc:
  moving time functions out of sql/ into sql-common/
sql/tztime.h:
  moving time functions out of sql/ into sql-common/

(since it's in the other -max builds already).


BUILD/compile-pentium-max:
  Removed obviously obsolete comment.
BUILD/compile-pentium-valgrind-max:
  Added same --with* options as for other -max builds (e.g. ndbcluster).

into mysql.com:/home/mydev/mysql-4.1-4100