ndb/src/common/mgmcommon/LocalConfig.cpp:
  Auto merged

ndb/src/mgmclient/CpcClient.cpp:
  small fix

need ndbrequire instead.

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

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

acinclude.m4:
  added configure switch for ndb base port
configure.in:
  ndb gcc compile now works with -fno-implicit-templates
mysql-test/ndb/ndb_config_2_node.ini:
  further simplifications of config, removed need for [COMPUTER] section
ndb/include/ndb_global.h:
  moved this to configure option
ndb/src/common/mgmcommon/ConfigInfo.cpp:
  changed config to take to take strings instead of ints
ndb/src/common/mgmcommon/ConfigInfo.hpp:
  changed config to take to take strings instead of ints
ndb/src/common/mgmcommon/InitConfigFileParser.cpp:
  string to number convert to accept "0x" prefix on numbers
ndb/src/common/mgmcommon/InitConfigFileParser.hpp:
  movet convert function to public and static
ndb/src/common/mgmcommon/LocalConfig.cpp:
  define NDB_BASE_PORT now string instead of number
ndb/src/common/mgmcommon/Makefile.am:
  added mysqld defines in mgmcommon to be able to configure default data dir to be the same as for mysqld

into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-4.1

mysql-test/r/binary.result:
  Fix for bug #5134: WHERE x = 'bar' AND x LIKE BINARY 'bar' returns wrong results
mysql-test/t/binary.test:
  Fix for bug #5134: WHERE x = 'bar' AND x LIKE BINARY 'bar' returns wrong results
sql/sql_select.cc:
  Fix for bug #5134: WHERE x = 'bar' AND x LIKE BINARY 'bar' returns wrong results

2) MAX_FRAG_PER_NODE separated from NO_OF_FRAG_PER_NODE and
takes into account large fragmentation
3) SUMA use config parameter instead of hard coded limit


ndb/src/kernel/blocks/backup/BackupInit.cpp:
  Moved addition of system tables and its attributes to Configuration.cpp
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Medium == default is one fragment per node
ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
  Use MAX_FRAG_PER_NODE, NO_OF_FRAG_PER_NODE is used for
  allocation purposes, still allowed to create a table with
  many fragments
ndb/src/kernel/blocks/suma/SumaInit.cpp:
  Use max no of tables configured instead of maximum configurable
ndb/src/kernel/vm/Configuration.cpp:
  Update configuration to handle also system tables and their attributes
ndb/src/kernel/vm/pc.hpp:
  Maximum fragments per node is 8 in the worst case

  Don't do this test for now: it fails on Mac OSX.


mysql-test/r/show_check.result:
  Don't do this test for now: it fails on Mac OSX.
mysql-test/t/show_check.test:
  Don't do this test for now: it fails on Mac OSX.

Fix for HEAP+HASH prefix keys.

Used proper config param for setting trigger pool size in TUP
Minimum long signal buffer set to 0.5M instead of 1M


ndb/src/common/mgmcommon/ConfigInfo.cpp:
  Minimum long signal buffer = 0.5M from 1M
ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  Used max no of triggers to define trigger pool in TUP
ndb/src/kernel/blocks/trix/Trix.cpp:
  Removed unused construct wasting 0.5M of memory
ndb/src/kernel/blocks/trix/Trix.hpp:
  Removed unused construct wasting 0.5M of memory

Dbutil decreased memory footprint
Suma decreased memory footprint
(16M memory removed from default config)


ndb/include/mgmapi/mgmapi_config_parameters.h:
  Long signal buffer size configurable
ndb/src/common/mgmcommon/ConfigInfo.cpp:
  Long signal buffer size configurable
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Long signal buffer size configurable
ndb/src/kernel/blocks/dbutil/DbUtil.cpp:
  Decrease size of memory for prepared operations in Dbutil
ndb/src/kernel/blocks/dbutil/DbUtil.hpp:
  Decrease size of memory for prepared operations in Dbutil
ndb/src/kernel/blocks/suma/Suma.cpp:
  Removed GREP use of SUMA that wasted 13.2M of memory
ndb/src/kernel/blocks/suma/Suma.hpp:
  Removed GREP use of SUMA that wasted 13.2M of memory
ndb/src/kernel/blocks/suma/SumaInit.cpp:
  Removed GREP use of SUMA that wasted 13.2M of memory
ndb/src/kernel/vm/TransporterCallback.cpp:
  Long signal buffer size configurable

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


sql/sql_select.cc:
  Auto merged

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

 * When executing EXPLAIN, do the same as for the query: convert join type to JT_CONST if keyuse array covers all key parts and all of them are constants.
 * In remove_const, don't remove conditions that depend on some-const-table and current-table.


mysql-test/r/join_outer.result:
  Testcase for bug#5088
mysql-test/t/join_outer.test:
  Testcase for bug#5088

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


sql/mysqld.cc:
  Auto merged

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

in ha_commit_trans - why it didn't crash earlier ?


mysql-test/r/null.result:
  after merge fix

sql/item_cmpfunc.h:
  Auto merged
mysql-test/r/join_outer.result:
  merged with 'ul'
mysql-test/r/null.result:
  merged with 'ul'

(cannot call it a "merge" :)

Abandoned improper use of MyISAM data.
Thanks Ingo!

cmd-line-utils/libedit/history.c:
  account for closing \0

into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1

into mysql.com:/Volumes/Backup1/wl2056

into build.mysql.com:/users/mronstrom/wl2056


ndb/src/common/mgmcommon/ConfigInfo.cpp:
  Auto merged
ndb/src/common/mgmcommon/LocalConfig.cpp:
  Auto merged
ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
  Auto merged
ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
  Auto merged
ndb/src/kernel/vm/Configuration.cpp:
  Auto merged
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

Fixing issue with NO_OF_FRAG_PER_NODE
Also removed some OSE code no longer needed when configurable log pages 


ndb/include/kernel/signaldata/FsCloseReq.hpp:
  Removing annoying compiler warning
ndb/include/mgmapi/mgmapi_config_parameters.h:
  New config parameters for Log Page Buffers
ndb/src/common/mgmcommon/ConfigInfo.cpp:
  New config parameters for Log Page Buffers
ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
  New config parameters for Log Page Buffers
  Fixing issue with NO_OF_FRAG_PER_NODE
ndb/src/kernel/blocks/dbacc/DbaccInit.cpp:
  New config parameters for Log Page Buffers
  Fixing issue with NO_OF_FRAG_PER_NODE
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  New config parameters for Log Page Buffers
  Fixing issue with NO_OF_FRAG_PER_NODE
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  New config parameters for Log Page Buffers
  Fixing issue with NO_OF_FRAG_PER_NODE
ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
  New config parameters for Log Page Buffers
  Fixing issue with NO_OF_FRAG_PER_NODE
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  New config parameters for Log Page Buffers
  Fixing issue with NO_OF_FRAG_PER_NODE
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  New config parameters for Log Page Buffers
  Fixing issue with NO_OF_FRAG_PER_NODE
ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  New config parameters for Log Page Buffers
  Fixing issue with NO_OF_FRAG_PER_NODE
ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp:
  New config parameters for Log Page Buffers
  Fixing issue with NO_OF_FRAG_PER_NODE
ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  New config parameters for Log Page Buffers
  Fixing issue with NO_OF_FRAG_PER_NODE
ndb/src/kernel/vm/pc.hpp:
  New config parameters for Log Page Buffers
  Fixing issue with NO_OF_FRAG_PER_NODE

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