into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new

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

Bug #17154  	load data infile hangs when duplicate key encountered


mysql-test/r/ndb_load.result:
  New BitKeeper file ``mysql-test/r/ndb_load.result''
mysql-test/t/ndb_load.test:
  New BitKeeper file ``mysql-test/t/ndb_load.test''

  init both pos and len


storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  init both pos and len

storage/ndb/include/ndbapi/NdbDictionary.hpp:
  ndb, added additional getters on NdbDictionary::Event
storage/ndb/src/ndbapi/NdbDictionary.cpp:
  ndb, added additional getters on NdbDictionary::Event
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  ndb, added additional getters on NdbDictionary::Event
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  ndb, added additional getters on NdbDictionary::Event

mysql-test/t/rpl_create_database.test:
  Updated to pass when other default engines are being used
mysql-test/r/rpl_create_database.result:
  Updated to pass when other default engines are being used
mysql-test/t/rpl_row_func003-slave.opt:
  new opt file to enusre innodb on slave
mysql-test/t/rpl_replicate_do.test:
  Updated with order by for use during ndb testing
mysql-test/r/rpl_replicate_do.result:
  Updated with order by for use during ndb testing
mysql-test/t/rpl_redirect.test:
  updated with order by
mysql-test/r/rpl_redirect.result:
  updated with order by
mysql-test/t/rpl_ndb_func003.test:
  New func003 wrapper to use NDB engine for table creation
mysql-test/r/rpl_ndb_func003.result:
  New func003 wrapper to use NDB engine for table creation
mysql-test/r/rpl_row_sp001.result:
  updated with order by
mysql-test/t/rpl_row_sp001.test:
  updated with order by
BitKeeper/deleted/.del-rpl_row_log.test~f6ed1be9e3ca110f:
  Delete: mysql-test/extra/rpl_tests/rpl_row_log.test
mysql-test/extra/rpl_tests/rpl_log.test:
  Updated test to ensure that MyISAM, and innodb engines passed even if NDB was used as default engine. Due to diff in bin log output between MyISAM, InnoDB and NDB the file had to use different wrappers and results files.
mysql-test/t/rpl_row_log.test:
  part of rpl_log.test check in
mysql-test/r/rpl_row_log.result:
  part of rpl_log.test check in
mysql-test/r/rpl_row_log_innodb.result:
  part of rpl_log.test check in
mysql-test/t/rpl_row_log_innodb-master.opt:
  part of rpl_log.test check in
mysql-test/t/rpl_row_log_innodb-slave.opt:
  part of rpl_log.test check in
mysql-test/t/rpl_row_log_innodb.test:
  part of rpl_log.test check in
mysql-test/r/rpl_ndb_log.result:
  part of rpl_log.test check in
mysql-test/t/rpl_ndb_log.test:
  part of rpl_log.test check in
mysql-test/t/rpl_ndb_log-master.opt:
  part of rpl_log.test check in
mysql-test/t/disabled.def:
  Updated with MySQL Bugs: #17158

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


sql/ha_ndbcluster.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
  Auto merged
storage/ndb/test/ndbapi/test_event.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  SCCS merged

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

into mysql.com:/home/psergey/mysql-5.1-wl2985-postfixes

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

into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new


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

+ added current test printout to error file


mysql-test/lib/mtr_cases.pl:
  harmonized mysql-test-run.sh and .pl

mysql-test/r/trigger-grant.result:
  Updated result file: use TRIGGER instead of SUPER for BUG#15166/15196 tests.
sql/item.cc:
  Updated according to the 5.1 data structures.

  rename error codes


mysql-test/t/ndb_dd_ddl.test:
  rename error code
sql/ha_ndbcluster.cc:
  rename error code
sql/share/errmsg.txt:
  rename error code

into  mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.1-tree


mysql-test/r/trigger-grant.result:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/t/trigger-grant.test:
  Merged.
sql/sql_trigger.cc:
  Merged.

mysql-test/t/ctype_ucs.test:
  Auto merged

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


sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged

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


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

Bug #17038, distribution of schema operation to multiple binlogs missing/multiple entries, partial fix
- log alter table directly in server instead of in handler
- acknowledge alter table _after_ all binlog events have been processed

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


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

  better error message on invalid config change


ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  fix typo
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Change error message...note that this is a guess

  ndb - error while restarting in dict
        improve error message when changed config leads to failed restart


ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  improve error message

  Print creating of dd objects during ndb_restore


storage/ndb/tools/restore/consumer_restore.cpp:
  Print creating of dd objects

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

  fix uninit variable in lgman


storage/ndb/src/kernel/blocks/lgman.cpp:
  fix uninit variable

  Fix for wierd var key restore problem


storage/ndb/src/kernel/blocks/restore.cpp:
  Fix? for wierd var key restore problem

storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
  unlock outstanding locks on scan close

mysql-test/t/partition_pruning.test:
  Auto merged
mysql-test/r/partition_pruning.result:
  SCCS merged

into  mysql.com:/space/pekka/ndb/version/my51

mysql-test/t/disabled.def:
  ndb_blob.test works again, sort of
storage/ndb/include/ndbapi/NdbBlob.hpp:
  better getNull & replace+tinyblob forward-patch from 5.0
storage/ndb/src/ndbapi/NdbBlob.cpp:
  better getNull & replace+tinyblob forward-patch from 5.0
storage/ndb/test/ndbapi/test_event.cpp:
  getEvent()->getTable()
sql/ha_ndbcluster.cc:
  return more error codes from blob calls
sql/ha_ndbcluster_binlog.cc:
  return more error codes from blob calls
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  return more error codes from blob calls
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  copy and invalidate blob tables as part of main table.  TODO: do not cache blob tables
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  copy and invalidate blob tables as part of main table.  TODO: do not cache blob tables

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


configure.in:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged

into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.1-new


sql/sql_parse.cc:
  Auto merged

into  mysql.com:/home/kostja/mysql/mysql-5.1-merge


sql/field.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged