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

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 mysql.com:/home/jonas/src/mysql-4.1-ndb

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

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

into build.mysql.com:/users/rburnett/mysql-4.1


sql/mysql_priv.h:
  Auto merged

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

Fix for MyISAM. Tests for MyISAM and HASH+BTREE.

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

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

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

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


sql/sql_select.cc:
  Auto merged

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

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

bug#4761 - more validation of hosts
bug#4511 - only non depricated should be saved in config
         - fix ConfigInfo::BOOL w.r.t deprication


mysql-test/ndb/ndb_config_2_node.ini:
  Removed need of unique filesystem
mysql-test/ndb/ndbcluster.sh:
  Removed need of unique filesystem
  Add "" around variables for increased portability
ndb/src/common/mgmcommon/ConfigInfo.cpp:
  Added checking of hostnames already in InitConfigFileParser
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  Add checking of hostnames when retreiving configuration
ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
  Added ndb_%u to filesystempath
ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp:
  Added ndb_%u to filesystempath
ndb/src/kernel/blocks/ndbfs/Filename.cpp:
  Added ndb_%u to filesystempath
ndb/src/kernel/blocks/ndbfs/Filename.hpp:
  Added ndb_%u to filesystempath
ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
  Added ndb_%u to filesystempath

When in find_item_in_list() we are looking for item we should take into account unaliased 
names of the fields but only if item with such aliased name is not found.
Also we should ignore aliases when looking for fully specified field.


mysql-test/r/order_by.result:
  Fixed wrong (non-standard) test results
  Added test case for bug #4302
  Added tests for other ambiguos and potentially ambigous cases in order by clause
mysql-test/t/order_by.test:
  Fixed wrong (non-standard) test results
  Added test case for bug #4302
  Added tests for other ambiguos and potentially ambigous cases in order by clause
sql/sql_select.cc:
  We should ignore only not_found_item errors when searching for item in find_order_in_list() 
  to be able to catch ambiguities.

   static linking against an unpatched glibc 2.3 is causing trouble
 - add "glibc23" to the release suffix in this case
 - re-ordered the Changelog that was messed up by a BK merge
   (RPM is picky about this)

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

into mysql.com:/home/pem/work/mysql-4.1

Bugfix for bug#5072, removed table version in BLOB table name since this is incremented at alter table

into mysql.com:/home/pem/work/mysql-4.1

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

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

sql/field.h:
  Fixed compiler warnings.

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

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


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

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


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

mysql-test/t/range.test:
  warnings disabled

into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1

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


include/mysql.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged