into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-icc


include/my_sys.h:
  Auto merged

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-icc

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push

  Fix compile error with gcc296


ndb/src/common/util/SimpleProperties.cpp:
  Fix compile error with gcc296

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push

Quote here is unneccessary as it should all be handled in
quote_opt_arg().

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-icc


myisam/mi_open.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
myisam/myisamdef.h:
  Auto merged
myisam/myisampack.c:
  Auto merged
sql/sql_parse.cc:
  Auto merged

mysys/mf_keycache.c:
  Auto merged

"configure --without-server"   (without giving "--enable-thread-safe-client").


mysys/mf_keycache.c:
  This module is needed both in the server (multi-threaded) and in some myisam tools (single-threaded).
  For the latter use, compilation failed in a "configure --without-server" as thread support was not
  defined then (unless "--enable-thread-safe-client" was also given, but this should not be required).
  The solution is to guard all threading operations in "#ifdef THREAD", and in the "#else" case adding
  assertions where appropriate. This fixes bug#11680.
  Also minor cleanup: Delete an unused variable, change "return" -> "DBUG_RETURN" in one place.

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push


ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvrConfig.cpp:
  Auto merged

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push


include/my_sys.h:
  Auto merged
mysys/default.c:
  Auto merged

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0


ndb/tools/ndb_config.cpp:
  merge

  Check returnvalue on load/fetch configuration


ndb/tools/ndb_config.cpp:
  Check returnvalue on load/fetch configuration

into mysql.com:/home/psergey/mysql-5.0-sept30-test

HA_KEY_SCAN_NOT_ROR index flag) as NDB index scans are not guaranteed to be ROR 
scans. 

  Add support/test for using my.cnf [cluster_config]


mysql-test/r/ndb_config.result:
  Add support for ndb_config to read my.cnf
mysql-test/t/ndb_config.test:
  Add support for ndb_config to read my.cnf
ndb/src/mgmsrv/InitConfigFileParser.cpp:
  merge
ndb/tools/ndb_config.cpp:
  Add support for ndb_config to read my.cnf
mysql-test/std_data/ndb_config_mycnf1.cnf:
  New BitKeeper file ``mysql-test/std_data/ndb_config_mycnf1.cnf''

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

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

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0


mysql-test/r/ndb_config.result:
  Auto merged
mysql-test/t/ndb_config.test:
  Auto merged
ndb/src/mgmsrv/InitConfigFileParser.cpp:
  Auto merged
ndb/src/mgmsrv/InitConfigFileParser.hpp:
  Auto merged
ndb/tools/ndb_config.cpp:
  Auto merged

 add support for reading config.ini from ndb_config
 (as alternative to contacting ndb_mgmd)


mysql-test/r/ndb_config.result:
  Add support for reading config.ini from ndb_config
mysql-test/t/ndb_config.test:
  Add support for reading config.ini from ndb_config
ndb/src/mgmsrv/InitConfigFileParser.cpp:
  Handle prinouts better
ndb/src/mgmsrv/InitConfigFileParser.hpp:
  Handle prinouts better
ndb/tools/ndb_config.cpp:
  Add support for reading config.ini from ndb_config

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-icc


client/mysqltest.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
myisam/myisamdef.h:
  Auto merged
sql/item.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged

include/my_sys.h:
  Initialised TYPE_NOT_SET to zero to make sure no
  enum is added before it.
server-tools/instance-manager/protocol.cc:
  Changed int to const int.

Tell the user that this ROLLBACK is added by mysqlbinlog (so that he does not wonder if it's present in binlog). This was brought up by Salle - thanks Salle.


client/mysqlbinlog.cc:
  tell the user that this ROLLBACK is added by mysqlbinlog (so that he does not wonder if it's present in binlog)
mysql-test/r/ctype_ucs_binlog.result:
  update
mysql-test/r/mysqlbinlog.result:
  update
mysql-test/r/mysqlbinlog2.result:
  update
mysql-test/r/rpl_charset.result:
  update
mysql-test/r/rpl_timezone.result:
  update
mysql-test/r/user_var-binlog.result:
  update

  allow ndb_mgmd to use my.cnf for cluster configuration


ndb/src/mgmsrv/ConfigInfo.cpp:
  Depricate Id infavor of nodeid in config.ini
ndb/src/mgmsrv/InitConfigFileParser.cpp:
  Add support for getting cluster config from my.cnf [cluster_config]
ndb/src/mgmsrv/InitConfigFileParser.hpp:
  Add support for getting cluster config from my.cnf [cluster_config]
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Add support for getting cluster config from my.cnf [cluster_config]
ndb/src/mgmsrv/MgmtSrvrConfig.cpp:
  Add support for getting cluster config from my.cnf [cluster_config]
ndb/src/mgmsrv/main.cpp:
  Add support for getting cluster config from my.cnf [cluster_config]

 analog with defaults_extra_file and defaults_grouop_suffix


include/my_sys.h:
  export forced_defaults_file using global variable defaults_file
mysys/default.c:
  export forced_defaults_file using global variable defaults_file

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


mysql-test/r/mysqldump.result:
  Auto merged

into  mysql.com:/usr/home/ram/work/mysql-5.0

into  mysql.com:/home/stewart/Documents/MySQL/5.0/main

ndb/include/mgmapi/ndb_logevent.h:
  more post-merge fixes
ndb/src/mgmapi/ndb_logevent.cpp:
  more post-merge fixes

into mysql.com:/home/psergey/mysql-5.0-bug13455

into  xiphis.org:/usr/home/antony/work2/p2-bug10586.5

into  xiphis.org:/usr/home/antony/work2/p2-bug10586.5

into mysql.com:/home/psergey/mysql-5.0-bug13455


mysql-test/r/innodb.result:
  Auto merged

"t.key BETWEEN c1 AND c2" and c1 = c2 -> can access table t using "t.key = c1".


mysql-test/r/heap.result:
  BUG#13455: updated test results
mysql-test/r/innodb.result:
  BUG#13455: updated test results
mysql-test/r/myisam.result:
  BUG#13455: updated test results
mysql-test/r/range.result:
  Testcase for BUG#13455
mysql-test/t/range.test:
  Testcase for BUG#13455

into  krsna.patg.net:/home/patg/mysql-build/mysql-5.0

everything except NDB


BUILD/SETUP.sh:
  Added base_max_no_ndb_configs so I can get a max-type build sans NDB for faster builds.
BUILD/compile-pentium-debug-max-no-ndb:
  new script to compile a max-type build sans NDB
BUILD/compile-ppc-debug-max-no-ndb:
  new script to build a max-type build sans NDB

  Corrected OpenServer ifdef test
Makefile.am:
  Added test-pl and test-force-pl targets


Makefile.am:
  Added test-pl and test-force-pl targets
server-tools/instance-manager/portability.h:
  Corrected OpenServer ifdef test