into  dator5.(none):/home/pappa/push_tree_w28


sql/ha_partition.cc:
  Auto merged

into  dator5.(none):/home/pappa/push_tree_w28


sql/ha_partition.cc:
  Auto merged
sql/ha_partition.h:
  Auto merged

into  dator5.(none):/home/pappa/push_tree_w28


sql/ha_partition.cc:
  Auto merged
sql/ha_partition.h:
  Auto merged

mysql-test/r/partition_order.result:
  Changed a test case to handle ordered index scan reverse order as well
mysql-test/t/partition_order.test:
  Changed a test case to handle ordered index scan reverse order as well
sql/ha_myisam.cc:
  More debug info
sql/ha_partition.cc:
  Introduced partition_index_read_last to ensure we use index_read_last in those
  cases towards underlying handler.
  Ensured that index_read with HA_READ_PREFIX_LAST, HA_READ_PREFIX_LAST_OR_PREV and
  HA_READ_BEFORE_KEY uses ordered index scan in reverse order.
sql/ha_partition.h:
  Introduced partition_index_read_last to ensure we use index_read_last in those
  cases towards underlying handler.
  Ensured that index_read with HA_READ_PREFIX_LAST, HA_READ_PREFIX_LAST_OR_PREV and
  HA_READ_BEFORE_KEY uses ordered index scan in reverse order.

mysql-test/r/partition_innodb.result:
  New test case
mysql-test/t/partition_innodb.test:
  New test case
sql/ha_partition.cc:
  Two more handler interface variables not taken care of

mysql-test/r/partition_mgm.result:
  Added new test case
mysql-test/t/partition_mgm.test:
  Added new test case
sql/ha_partition.cc:
  Fixed memory overwrite, added new variable for memory check
  Problem was when reorganising partitions, the file handles
  got in the wrong place.
sql/ha_partition.h:
  Added new variable for debugging mostly

into  bodhi.netgear:/opt/local/work/mysql-5.1-runtime-merge

removed alter table partition error test since it cannot be made predictable... name will change of created file

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

into  bodhi.netgear:/opt/local/work/mysql-5.1-runtime-merge


BitKeeper/etc/ignore:
  auto-union

mysql-test/t/ndb_dd_backuprestore.test:
  make sure only run in default cluster
mysql-test/t/rpl_ndb_dd_advance.test:
  make sure only run in default cluster
mysql-test/t/rpl_ndb_sync.test:
  make sure only run in default cluster

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


mysql-test/r/ndb_restore.result:
  manual merge
mysql-test/t/ndb_restore.test:
  manual merge
storage/ndb/tools/restore/consumer_restore.cpp:
  manual merge

into trift2.:/M51/bug20216-5.1


scripts/Makefile.am:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged

into trift2.:/M51/merge-5.1

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

- missing order by

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


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

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0


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

- don't invalidate tables that are in state RETRIEVING

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

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

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

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


storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  SCCS merged

into  mysql.com:/home/marty/MySQL/mysql-5.1


storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged

into  mysql.com:/home/ndbdev/ngrishakin/mysql-5.1-new-ndb

mysql-test/t/ndb_dd_advance.test:
  ndb_dd_advance.test
mysql-test/t/ndb_dd_advance2.test:
  ndb_dd_advance2.test
mysql-test/r/ndb_dd_advance.result:
  ndb_dd_advance.result
mysql-test/r/ndb_dd_advance2.result:
  ndb_dd_advance2.result

- flush gci needs to be reset on disconnect as cluster may reconnect after --initial with a smaller gci


storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  Bug #20843 tests fails randomly with assertion in completeClusterFailed
  reenabled test

  Delete: mysql-test/r/ndb_dd_advance.result
.del-ndb_dd_advance2.result~89be9fe55c2fda5a:
  Delete: mysql-test/r/ndb_dd_advance2.result
.del-ndb_dd_advance2.test~e9e56bc3e8e8f740:
  Delete: mysql-test/t/ndb_dd_advance2.test
.del-ndb_dd_advance.test~58e757b6c1d33996:
  Delete: mysql-test/t/ndb_dd_advance.test


BitKeeper/deleted/.del-ndb_dd_advance.test~58e757b6c1d33996:
  Delete: mysql-test/t/ndb_dd_advance.test
BitKeeper/deleted/.del-ndb_dd_advance2.test~e9e56bc3e8e8f740:
  Delete: mysql-test/t/ndb_dd_advance2.test
BitKeeper/deleted/.del-ndb_dd_advance2.result~89be9fe55c2fda5a:
  Delete: mysql-test/r/ndb_dd_advance2.result
BitKeeper/deleted/.del-ndb_dd_advance.result~165b282a93715547:
  Delete: mysql-test/r/ndb_dd_advance.result

into  mysql.com:/home/ndbdev/ngrishakin/mysql-5.1

mysql-test/r/partition_range.result:
  New test case
mysql-test/t/partition_range.test:
  New test case
sql/partition_info.cc:
  No changes

mysql-test/mysql-test-run.pl:
  Auto merged

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

- reenabled test as this now seems fixed

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


storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged

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


storage/ndb/include/mgmapi/ndbd_exit_codes.h:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
storage/ndb/src/kernel/error/ndbd_exit_codes.c:
  Auto merged