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  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18962

Review fixes


sql/partition_info.cc:
  Review fixes
sql/partition_info.h:
  Review fixes

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


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

mysql-test/std_data/ndb_backup50/BACKUP-1.1.ctl:
  New BitKeeper file ``mysql-test/std_data/ndb_backup50/BACKUP-1.1.ctl''
mysql-test/std_data/ndb_backup50/BACKUP-1.2.ctl:
  New BitKeeper file ``mysql-test/std_data/ndb_backup50/BACKUP-1.2.ctl''
mysql-test/std_data/ndb_backup51/BACKUP-1.1.ctl:
  New BitKeeper file ``mysql-test/std_data/ndb_backup51/BACKUP-1.1.ctl''
mysql-test/std_data/ndb_backup51/BACKUP-1.2.ctl:
  New BitKeeper file ``mysql-test/std_data/ndb_backup51/BACKUP-1.2.ctl''

into  rurik.mysql.com:/home/igor/dev/mysql-5.1-2


mysql-test/r/index_merge_innodb.result:
  Auto merged
sql/opt_range.cc:
  Auto merged

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


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

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

- added compatability with 5.0
- added test case for compatability with 5.0 and 5.1


mysql-test/std_data/ndb_backup50/BACKUP-1-0.1.Data:
  New BitKeeper file ``mysql-test/std_data/ndb_backup50/BACKUP-1-0.1.Data''
mysql-test/std_data/ndb_backup50/BACKUP-1-0.2.Data:
  New BitKeeper file ``mysql-test/std_data/ndb_backup50/BACKUP-1-0.2.Data''
mysql-test/std_data/ndb_backup50/BACKUP-1.1.log:
  New BitKeeper file ``mysql-test/std_data/ndb_backup50/BACKUP-1.1.log''
mysql-test/std_data/ndb_backup50/BACKUP-1.2.log:
  New BitKeeper file ``mysql-test/std_data/ndb_backup50/BACKUP-1.2.log''
mysql-test/std_data/ndb_backup51/BACKUP-1-0.1.Data:
  New BitKeeper file ``mysql-test/std_data/ndb_backup51/BACKUP-1-0.1.Data''
mysql-test/std_data/ndb_backup51/BACKUP-1-0.2.Data:
  New BitKeeper file ``mysql-test/std_data/ndb_backup51/BACKUP-1-0.2.Data''

into  rurik.mysql.com:/home/igor/dev/mysql-5.1-2

into  rurik.mysql.com:/home/igor/mysql-5.1

into  mysql.com:/opt/local/work/mysql-5.1-merge

mi_open() should accept filename w/i extension and with .MYI

- corrected log read after fragment id addition

into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18962


mysql-test/r/partition_pruning.result:
  Auto merged
sql/partition_info.cc:
  Auto merged

mysql-test/include/rpl_multi_engine3.inc:
  add some sleep for __slow__ replication
mysql-test/t/disabled.def:
  enable rpl_ndb_2myisam but keep rpl_ndb_2innodb disabled, new bug#19227

into  mysql.com:/opt/local/work/mysql-5.1-merge

into  rurik.mysql.com:/home/igor/mysql-5.1

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

- binlog thread should not wait for apply status share if binlog is not enabled

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

Fix for bug#19196: Attempt to create index on usupported field type gives wrong error code: updated with new expected error codes

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


storage/ndb/include/kernel/signaldata/TupFrag.hpp:
  Auto merged
storage/ndb/include/util/NdbSqlUtil.hpp:
  Auto merged
storage/ndb/src/common/util/NdbSqlUtil.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp:
  Auto merged
mysql-test/r/ndb_bitfield.result:
  Merge, will generate new result file manually
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Merge

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


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

Fix build of taocrypt. Don't mention /GX or /EHsc as that will turn ON exception handling and not off as we want.


extra/yassl/taocrypt/cmakelists.txt:
  Don't write anything about /GX or /EHsc as cmake will detect that and turn exception handling ON. Since it's off by default, that is what we want.

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

into  mysql.com:/home/bk/b17400-mysql-5.1-new

Removed rpl_ndb_relay_space test since it does not make sense (in
its current form) for NDB.


BitKeeper/deleted/.del-rpl_ndb_relay_space.test~55e5e4b13d3936d0:
  Delete: mysql-test/t/rpl_ndb_relay_space.test
BitKeeper/deleted/.del-rpl_ndb_relay_space.result~a44835cdd2210d18:
  Delete: mysql-test/r/rpl_ndb_relay_space.result

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