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

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


storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged

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


support-files/mysql.spec.sh:
  Auto merged
storage/ndb/include/util/SocketServer.hpp:
  Auto merged
storage/ndb/src/common/transporter/Transporter.cpp:
  Auto merged
storage/ndb/src/common/util/SocketServer.cpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  Auto merged

  fix dirty page handling during opt.nr


storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  fix dirty page handling during opt.nr

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


ndb/include/util/SocketServer.hpp:
  Auto merged
ndb/src/common/transporter/Transporter.cpp:
  Auto merged
ndb/src/common/util/SocketServer.cpp:
  Auto merged
ndb/src/mgmsrv/Services.cpp:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged

  Fix alignment of sockaddr(_in)


ndb/src/common/transporter/Transporter.cpp:
  Fix alignment of sockaddr(_in)
ndb/src/mgmsrv/Services.cpp:
  Fix alignment of sockaddr(_in)

  ndb_mgmd limited no of api nodes, by restricting no of mgmsessions
  (these are used for dynamic port allocation)


ndb/include/util/SocketServer.hpp:
  Increase default max session to ~0
ndb/src/common/util/SocketServer.cpp:
  Increase default max session to ~0

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new


mysql-test/t/disabled.def:
  Auto merged

mysql-test/include/have_case_sensitive_file_system.inc:
  New BitKeeper file ``mysql-test/include/have_case_sensitive_file_system.inc''
mysql-test/r/case_sensitive_file_system.require:
  New BitKeeper file ``mysql-test/r/case_sensitive_file_system.require''
mysql-test/r/ndb_restore_compat.result:
  New BitKeeper file ``mysql-test/r/ndb_restore_compat.result''
mysql-test/t/ndb_restore_compat.test:
  New BitKeeper file ``mysql-test/t/ndb_restore_compat.test''

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new


mysql-test/t/disabled.def:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

into lmy004.:/work/mysql-5.1-new-clean


mysql-test/t/disabled.def:
  Auto merged

the fix from 5.0 with necessary modifications applied.


sql/sql_base.cc:
  Manual merge with 5.0.

into  mysql.com:/home/elkin/MySQL/MERGE/5.1-new


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/case.result:
  Auto merged
mysql-test/r/rpl_temporary.result:
  Auto merged
mysql-test/t/case.test:
  Auto merged
mysql-test/t/rpl_temporary.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
storage/myisam/myisam_ftdump.c:
  Auto merged
sql/sql_base.cc:
  manual merge use local. Another changeset for 5.1 is following.

mysql-test/extra/rpl_tests/rpl_insert_id.test:
  Post-merge fix. Added new 5.0 test case manually.
sql/sql_yacc.yy:
  Post-merge fix. Removed GOTO/LABEL from parser.

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


sql/sql_yacc.yy:
  Auto merged

  Fix bootstrap/compile error


storage/ndb/tools/restore/restore_main.cpp:
  Fix bootstrap/compile error

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


storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged

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


storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged

  Fix so that testDict can use/handle disk tables


storage/ndb/test/ndbapi/testDict.cpp:
  Fix so that testDict can use/handle disk tables

into  mysql.com:/extern/mysql/5.1/generic/mysql-5.1-new


mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/timezone_grant.result:
  Auto merged
mysql-test/r/trigger.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/lex.h:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
mysql-test/r/rpl_insert_id.result:
  Manual merge.
mysql-test/t/disabled.def:
  Manual merge.
mysql-test/t/rpl_insert_id.test:
  Manual merge.
sql/item_func.cc:
  Manual merge.
sql/sql_yacc.yy:
  Manual merge - not complete yet.

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new


storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged

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


storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged

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


ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged

  Handle early abort of scan, so that resources are correctly freed


ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Handle early abort
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Handle early abort so that require on running.empty() does not fire

into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new

- the replica info was not stored in byte order indepentent format
- backup/restore still compatible 5.0->5.1
- but patch makes previous 5.1 versions completely incompatible

1) relax version check for restore block since no changes has happend since 5.1.6
   and improve error message on check failure
   
2) improve lcp/backup max write size...


storage/ndb/src/kernel/blocks/backup/BackupInit.cpp:
  Increase max write size to 256k (currently not configurable...)
storage/ndb/src/kernel/blocks/restore.cpp:
  Relax version check for restore block since no changes has happend since 5.1.6
storage/ndb/src/kernel/blocks/restore.hpp:
  Relax version check for restore block since no changes has happend since 5.1.6

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new

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

into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new


sql/ha_ndbcluster.cc:
  Auto merged

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new

client/mysql.cc:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/t/rpl_relayrotate.test:
  Auto merged
mysys/mf_keycache.c:
  Auto merged
BitKeeper/deleted/.del-innodb_unsafe_binlog-master.opt~9cbe1bb3d8696c5b:
  Auto merged
mysql-test/t/rpl_stm_until.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/lock.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/unireg.h:
  Auto merged
storage/ndb/src/kernel/SimBlockList.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp:
  Auto merged

into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new-ndb

into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new-ndb

into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new