storage/ndb/include/kernel/ndb_limits.h:
  remove hardcoded limit
storage/ndb/include/kernel/signaldata/FsReadWriteReq.hpp:
  Add new format "shared" page to easily migrate from/to superpool
storage/ndb/include/mgmapi/mgmapi_config_parameters.h:
  Introduce new config parameter for "SharedGlobalMemory",
    only user is so far undo log buffer memory
storage/ndb/src/common/debugger/signaldata/FsReadWriteReq.cpp:
  Add new format "shared" page to easily migrate from/to superpool
storage/ndb/src/kernel/SimBlockList.cpp:
  Fix compiler error
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Add new format "shared" page to easily migrate from/to superpool
storage/ndb/src/kernel/blocks/lgman.cpp:
  Add new format "shared" page to easily migrate from/to superpool
storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
  Add new format "shared" page to easily migrate from/to superpool
storage/ndb/src/kernel/vm/GlobalData.hpp:
  Add new format "shared" page to easily migrate from/to superpool
storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
  Add new format "shared" page to easily migrate from/to superpool
storage/ndb/src/kernel/vm/SimulatedBlock.hpp:
  Add new format "shared" page to easily migrate from/to superpool
storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp:
  better startup printouts
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Introduce new config parameter for "SharedGlobalMemory",
    only user is so far undo log buffer memory
storage/ndb/src/mgmsrv/InitConfigFileParser.cpp:
  Fix bug in handling of my.cnf files

  add more printouts to unit test of buddy allocator


storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp:
  Add some more debugging in UNIT_TEST

  - add resource limit to buddy allocator


storage/ndb/src/kernel/SimBlockList.cpp:
  Add emulator data to args
storage/ndb/src/kernel/blocks/record_types.hpp:
  Update record types
storage/ndb/src/kernel/main.cpp:
  Add emulator data to args
storage/ndb/src/kernel/vm/Emulator.cpp:
  Add emulator data to args
storage/ndb/src/kernel/vm/Emulator.hpp:
  Add emulator data to args
storage/ndb/src/kernel/vm/Makefile.am:
  Add emulator data to args
storage/ndb/src/kernel/vm/Pool.hpp:
  Update
storage/ndb/src/kernel/vm/SimBlockList.hpp:
  Add emulator data to args
storage/ndb/src/kernel/vm/SimulatedBlock.hpp:
  Add emulator data to args
storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp:
  use resource_limit in buddy
storage/ndb/src/kernel/vm/ndbd_malloc_impl.hpp:
  Add emulator data to args
storage/ndb/src/kernel/vm/Pool.cpp:
  New BitKeeper file ``storage/ndb/src/kernel/vm/Pool.cpp''

  dont sync create table during sr _or_ nr


storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  dont sync on NR either

  Init lsn


storage/ndb/src/kernel/blocks/lgman.cpp:
  Init lsn

  bug fix in ordered index build


storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp:
  Fix ordered index build

  sync create tabe to undo log, so that undo for other table is not run after SR


storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Sync create table in undo log
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  Sync create table in undo log

  Fix bug in tsman undo


BitKeeper/deleted/.del-RecordPool.hpp~b2360628ee40b04e:
  Delete: storage/ndb/src/kernel/vm/RecordPool.hpp
storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
  Add page lsn to undo handling in tsman
storage/ndb/src/kernel/blocks/record_types.hpp:
  Start filling up record_types.hpp
storage/ndb/src/kernel/blocks/tsman.cpp:
  Add page_lsn to undo handling
storage/ndb/src/kernel/blocks/tsman.hpp:
  Add page_lsn to undo handling
storage/ndb/src/kernel/vm/Makefile.am:
  Remove SuperPool & NdbdSuperPool for now
storage/ndb/src/kernel/vm/Pool.hpp:
  Update Pool.hpp
storage/ndb/src/kernel/vm/pc.hpp:
  Move Ptr to Pool.hpp

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


storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/lgman.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/pgman.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/pgman.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/tsman.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  merge

into  eel.(none):/home/jonas/src/mysql-5.1-new


storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged

  fix undo of bitmap


storage/ndb/include/kernel/signaldata/PgmanContinueB.hpp:
  Handle locked pages last
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Remove LCP_PREPARE to pgman
storage/ndb/src/kernel/blocks/dblqh/Makefile.am:
  Fix make of redo reader
storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  Fix assert
storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
  Fix bitmap undo
storage/ndb/src/kernel/blocks/lgman.cpp:
  Better lgman dump
storage/ndb/src/kernel/blocks/pgman.cpp:
  LCP locked pages last
storage/ndb/src/kernel/blocks/pgman.hpp:
  Handle locked pages last
storage/ndb/src/kernel/blocks/tsman.cpp:
  Fix bitmap undo

into  mysql.com:/usr/home/bar/mysql-5.1-new.fscs


mysql-test/r/variables.result:
  SCCS merged
mysql-test/t/variables.test:
  SCCS merged

into  mysql.com:/usr/home/bar/mysql-5.1-new.fscs

into  mysql.com:/usr/home/bar/mysql-5.0.cs_fs


sql/set_var.cc:
  Auto merged

  Backporting character_set_filesystem from 5.0 to 5.1.


sql/mysqld.cc:
  Backporting character_set_filesystem from 5.0 to 5.1.
sql/set_var.cc:
  Backporting character_set_filesystem from 5.0 to 5.1.
sql/set_var.h:
  Backporting character_set_filesystem from 5.0 to 5.1.
sql/sql_class.cc:
  Backporting character_set_filesystem from 5.0 to 5.1.
sql/sql_class.h:
  Backporting character_set_filesystem from 5.0 to 5.1.
sql/sql_yacc.yy:
  Backporting character_set_filesystem from 5.0 to 5.1.
mysql-test/t/variables.test:
  Backporting character_set_filesystem from 5.0 to 5.1.
mysql-test/r/variables.result:
  Backporting character_set_filesystem from 5.0 to 5.1.

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

into  mysql.com:/home/alexi/innodb/mysql-5.1-ss115x

  the innodb-5.0-ss115 snapshot.


BitKeeper/deleted/.del-innodb_unsafe_binlog.test~8c3e0832ef20aa2:
  Delete: mysql-test/t/innodb_unsafe_binlog.test
BitKeeper/deleted/.del-innodb_unsafe_binlog-master.opt~9cbe1bb3d8696c5b:
  Delete: mysql-test/t/innodb_unsafe_binlog-master.opt
BitKeeper/deleted/.del-innodb_unsafe_binlog.result~7617b075b81d112d:
  Delete: mysql-test/r/innodb_unsafe_binlog.result

- no check was made that ndb thd object was allocated


sql/ha_ndbcluster.h:
  Bug #17340  	SHOW CREATE TABLE from second session crashes the server
sql/handler.h:
  Bug #17340  	SHOW CREATE TABLE from second session crashes the server
sql/sql_show.cc:
  Bug #17340  	SHOW CREATE TABLE from second session crashes the server

into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new

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

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

-flag was set on field intable share instead of table


mysql-test/r/ndb_basic.result:
  Bug #17179  	schema creation fails
mysql-test/t/ndb_basic.test:
  Bug #17179  	schema creation fails

  Removed C++ comment, changed types for pthread_create() usage


client/mysqlimport.c:
  Removed C++ comment, changed types for pthread_create() usage

mysql-test/r/rpl_loaddata_s.result:
  Missed line

into  mysql.com:/users/lthalmann/bk/mysql-5.1-new-bug17339

into  mysql.com:/users/lthalmann/bkroot/mysql-5.1-new

into  mysql.com:/users/lthalmann/bk/mysql-5.1-new-bug17339

into  zim.tangent.org:/home/brian/mysql/cleanup-5.1

mysql-test/t/disabled.def:
  Removed reference to  failed test.
sql/ha_archive.cc:
  This fixes the optimize problem introduced in a bad merge.

support-files/mysql.spec.sh:
  - Use "-i" on "make test-force",
  - document other recent changes in the changelog section (where notes were missing).

BUG#17339: Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
For this particular bug report it was rpl_loadfile.test that did not make proper cleanup, but the patch
includes fixes for other tests aswell.


mysql-test/r/rpl_loaddata2.result:
  Cleanup
mysql-test/r/rpl_redirect.result:
  Cleanup
mysql-test/r/rpl_slave_status.result:
  Cleanup
mysql-test/t/rpl_LD_INFILE.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_drop_temp.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_ignore_table.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_loaddata2.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_loaddata_m.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_loaddata_s.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_loadfile.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_multi_update4.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_ndb_basic.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_redirect.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_row_func001.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_row_func002.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_row_sp001.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_row_sp005.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_row_sp008.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_row_sp009.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_row_sp010.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_row_sp011.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_row_sp012.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_row_trig001.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_row_trig002.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_skip_error.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_slave_status.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_sp.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_sp004.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave

into  mysql.com:/users/lthalmann/bkroot/mysql-5.1-new

into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1


sql/set_var.cc:
  manual merge.

into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0-clone

  Fix out-of-order system variable.


sql/set_var.cc:
  Fix out-of-order system variable.

into mysql.com:/M50/rpmspec-5.0

    "Use remote": Let the other changes (test the debug binary) precede.


support-files/mysql.spec.sh:
  "Use remote": Let the other changes (test the debug binary) precede.