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


storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged

  disable "disable expand check" as it does not solve problems anyway


storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  disable "disable expand check" as it does not solve problems anyway

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

  add Dbdict::restartDropObj*


storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  add restartDropObj
  - handle undo files "specially"
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  add restartDropObj*
storage/ndb/src/kernel/blocks/lgman.cpp:
  allow drop of meta files
storage/ndb/src/kernel/blocks/tsman.cpp:
  allow drop of meta files
storage/ndb/test/ndbapi/testDict.cpp:
  add testcase
storage/ndb/test/run-test/daily-basic-tests.txt:
  add testcase

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user

mysql-test/include/have_log_bin.inc:
  New BitKeeper file ``mysql-test/include/have_log_bin.inc''
mysql-test/r/have_log_bin.require:
  New BitKeeper file ``mysql-test/r/have_log_bin.require''

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


sql/ha_ndbcluster.cc:
  manual merge

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

- add retry sleep to allow temprary error to go away

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


storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  Auto merged

  remove LCP files when dropping table


storage/ndb/include/kernel/signaldata/FsOpenReq.hpp:
  add tup as user (for fsremove)
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  add remove LCP stuff
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  add remove LCP stuff
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  remove each LCP file regardless if present or not

into  dator3.(none):/home/mikael/mysql_clones/rt-5.0

into  dator3.(none):/home/mikael/mysql_clones/rt-5.1

- correct manual/auto merge to 5.1

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


sql/ha_ndbcluster.cc:
  manual merge

- make sure resources are release properly on error

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged

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


ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged

into  dator3.(none):/home/mikael/mysql_clones/rt-5.0

into  dator3.(none):/home/mikael/mysql_clones/rt-5.1

into  whalegate.ndb.mysql.com:/home/tomas/mysql-4.1-ndb

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/handler.cc:
  manual merge
sql/mysqld.cc:
  manual merge
sql/set_var.cc:
  manual merge
sql/sql_plugin.cc:
  manual merge

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

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-opt


sql/handler.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_class.h:
  Auto merged

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


storage/ndb/include/ndbapi/NdbRecAttr.hpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
storage/ndb/src/ndbapi/ClusterMgr.cpp:
  Auto merged
storage/ndb/src/ndbapi/ClusterMgr.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbRecAttr.cpp:
  manual merge

enable setting api reg req frequency to be higher than heartbeat setting to ensure we have reasonably up-to-date info from ndb nodes
+ do this for management server

  - corrected previous patch
  - some platforms do strange things with char... use Int8 to be sure of signedness

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-opt


mysql-test/r/loaddata.result:
  Auto merged
mysql-test/t/loaddata.test:
  Auto merged

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


storage/ndb/include/ndbapi/NdbRecAttr.hpp:
  Auto merged

  A test case is corrected.


mysql-test/t/loaddata.test:
  A test case is corrected.
mysql-test/r/loaddata.result:
  A test case is corrected.

- some platforms do strange things with char... use Int8 to be sure of signedness

into  olga.mysql.com:/home/igor/mysql-5.1-opt


mysql-test/t/loaddata.test:
  Auto merged
sql/sql_load.cc:
  Auto merged
mysql-test/r/loaddata.result:
  SCCS merged

into  moonbone.local:/mnt/gentoo64/work/27670-bug-5.0-opt-mysql

TIMESTAMP field when no value has been provided.

The LOAD DATA sets the current time in the TIMESTAMP field with
CURRENT_TIMESTAMP default value when the field is detected as a null.
But when the LOAD DATA command loads data from a file that doesn't contain
enough data for all fields then the rest of fields are simply set to null
without any check. This leads to no value being inserted to such TIMESTAMP
field.

Now the read_sep_field() and the read_fixed_length() functions set current
time to the TIMESTAMP field with CURRENT_TIMESTAMP default value in all cases
when a NULL value is loaded to the field.


mysql-test/t/loaddata.test:
  Added a test case for the bug#27670: LOAD DATA does not set CURRENT_TIMESTAMP
  default value for a TIMESTAMP field when no value has been provided.
mysql-test/r/loaddata.result:
  Added a test case for the bug#27670: LOAD DATA does not set CURRENT_TIMESTAMP
  default value for a TIMESTAMP field when no value has been provided.
sql/sql_load.cc:
  Bug#27670: LOAD DATA does not set CURRENT_TIMESTAMP default value for a
  TIMESTAMP field when no value has been provided.
  Now the read_sep_field() and the read_fixed_length() functions set current
  time to the TIMESTAMP field with CURRENT_TIMESTAMP default value in all cases
  when a NULL value is loaded to the field.

  After merge fix.


sql/item_cmpfunc.cc:
  After merge fix.
sql/item_cmpfunc.h:
  After merge fix.
mysql-test/r/type_datetime.result:
  After merge fix.
mysql-test/t/type_datetime.test:
  After merge fix.

BitKeeper/etc/ignore:
  Added libmysqld/ha_ndbcluster_cond.cc to the ignore list