ndb/src/common/portlib/NdbMem.c:
  Simplify insertion of print comments
ndb/src/common/util/new.cpp:
  malloc -> NdbMem_Allocate
ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
  Increase number of idle files to avoid allocation after starting
  ndbd

malloc -> NdbMem_Allocate


ndb/include/mgmapi/mgmapi_config_parameters.h:
  Added Meta Data config parameter constants
ndb/src/common/mgmcommon/ConfigInfo.cpp:
  Added Meta Data config parameters
ndb/src/common/mgmcommon/LocalConfig.cpp:
  malloc -> NdbMem_Allocate
ndb/src/common/mgmcommon/NdbConfig.c:
  malloc -> NdbMem_Allocate
ndb/src/common/portlib/NdbCondition.c:
  malloc -> NdbMem_Allocate
ndb/src/common/portlib/NdbMutex.c:
  malloc -> NdbMem_Allocate
ndb/src/common/portlib/NdbThread.c:
  malloc -> NdbMem_Allocate
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Removed memory allocation as part of new of TcIndexOperation
ndb/src/kernel/blocks/dbtc/DbtcInit.cpp:
  Some minor things + change of config parameter for consistency
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Removed memory allocation as part of new of TcIndexOperation
ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
  malloc -> NdbMem_Allocate
ndb/src/kernel/vm/Configuration.cpp:
  malloc -> NdbMem_Allocate
  + New config parameters for more consistency
ndb/src/kernel/vm/pc.hpp:
  Not so many fragments allocated. Saves 140kBytes per table
  160 kb -> 20 kb per table

into poseidon.(none):/home/tomas/mysql-4.1

  LIKE crashed mysqld for binary collations in some cases


mysql-test/r/func_like.result:
  LIKE crashed mysqld for binary collations in some cases

  LIKE crashed mysqld for binary collations in some cases


strings/ctype-big5.c:
  LIKE crashed mysqld for binary collations in some cases
strings/ctype-euc_kr.c:
  LIKE crashed mysqld for binary collations in some cases
strings/ctype-gb2312.c:
  LIKE crashed mysqld for binary collations in some cases
strings/ctype-gbk.c:
  LIKE crashed mysqld for binary collations in some cases
strings/ctype-latin1.c:
  LIKE crashed mysqld for binary collations in some cases
strings/ctype-sjis.c:
  LIKE crashed mysqld for binary collations in some cases
strings/ctype-tis620.c:
  LIKE crashed mysqld for binary collations in some cases
strings/ctype-ucs2.c:
  LIKE crashed mysqld for binary collations in some cases
strings/ctype-ujis.c:
  LIKE crashed mysqld for binary collations in some cases
strings/ctype-utf8.c:
  LIKE crashed mysqld for binary collations in some cases
sql/item_cmpfunc.cc:
  LIKE crashed mysqld for binary collations in some cases

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

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

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


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

into mysql.com:/dbdata/psergey/mysql-4.1-root

(old code mixed the 3 alternatives: native, [lo, hi], [hi, lo])

This fixes problem with auto increment on different byte order

(This also make adding of signed ints really simple...)


ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Use native format in interpreter
  (old code mixed the 3 alternatives: native, [lo, hi], [hi, lo])
ndb/src/ndbapi/Ndb.cpp:
  Use native format in interpreter
  (old code mixed the 3 alternatives: native, [lo, hi], [hi, lo])
ndb/src/ndbapi/NdbOperationInt.cpp:
  Use native format in interpreter
  (old code mixed the 3 alternatives: native, [lo, hi], [hi, lo])

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

(specific to 4.1): don't put CLIENT_LOCAL_FILES in
CLIENT_CAPABILITIES; it would make mysql_options(CLIENT_LOCAL_FILES,0)
have no effect.


libmysql/client_settings.h:
  Don't enforce that we client have CLIENT_LOCAL_FILES;
  indeed this CLIENT_CAPABILITIES is used as minimum
  client options in mysql_real_connect(), which is *after*
  mysql_options(). Having CLIENT_LOCAL_FILES in
  CLIENT_CAPABILITIES defeats disabling it in mysql_options().

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

into poseidon.(none):/home/tomas/mysql-4.1

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

ndb/include/ndb_global.h:
  Include my_alarm (to get signal.h)
ndb/src/cw/cpcd/Process.cpp:
  Include my_alarm (to get signal.h)
ndb/src/cw/cpcd/main.cpp:
  Include my_alarm (to get signal.h)
ndb/src/kernel/main.cpp:
  Include my_alarm (to get signal.h)
ndb/src/kernel/vm/Emulator.cpp:
  Include my_alarm (to get signal.h)
ndb/src/mgmclient/main.cpp:
  Include my_alarm (to get signal.h)
ndb/src/mgmsrv/Services.cpp:
  Include ndb_global instead of string.h
ndb/src/ndbapi/NdbOperationInt.cpp:
  Keep consistent order of 64 bits in interpreter
ndb/src/ndbapi/TransporterFacade.cpp:
  Include my_alarm (to get signal.h)

into avenger.(none):/export/brian/mysql/4.1

sql/examples/ha_tina.cc:
  Adding in pieces to remove from compile (aka ifdef).

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

hpux11 compiler dislikes empty array initializers.

Limit testBackup BackupOne

ndb/test/ndbapi/testBackup.cpp:
  Drop table after testBackup
ndb/test/src/NdbBackup.cpp:
  Remove node id

ndb/src/ndbapi/TransporterFacade.cpp:
  Retry alloc of node id

mysql-test/r/range.result:
  Fix for bug#4488: more tests
mysql-test/t/range.test:
  Fix for bug#4488: more tests

mysql-test/r/ps_1general.result:
  Updated test results for addition of CSV engine.

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

var->save_result.ulong_value was 0 on Mac OS X probably due to positions
of members in the union. sys_var::check() only sets ulonglong_value


sql/set_var.cc:
  Of the save_result union, sys_var::check() only updates ulonglong_value;
  so other types of the union are garbage. Here we must use ulonglong_value
  in sys_var_sync_binlog_period::update(), not ulong_value (which is )

  Bug#4521: unique prefix keys, fix for HEAP HASH and HEAP BTREE case insensitive collations.


mysql-test/t/ctype_utf8.test:
  Bug#4521: unique prefix keys, fix for HEAP HASH and HEAP BTREE case insensitive collations.

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

sql-bench/server-cfg.sh:
  Remove the limitation for NDB+blobs

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

2) Fix variable scope for irix compiler


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Remove part of require
ndb/test/src/NDBT_Tables.cpp:
  old compiler fix

ndb/src/kernel/blocks/dbtup/DbtupPagMan.cpp:
  Init page state
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Init usr pointer for tcseize/releasereq
ndb/test/src/NDBT_Tables.cpp:
  More error printouts

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