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.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.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

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


mysql-test/r/ndb_basic.result:
  Auto merged
mysql-test/t/ndb_basic.test:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/set_var.cc:
  Auto merged
BitKeeper/deleted/.del-ndb_config_1_node.ini:
  Auto merged
BitKeeper/deleted/.del-ndb_config_4_node.ini:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Auto merged
mysql-test/ndb/ndb_config_2_node.ini:
  manual merge

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

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


storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
storage/ndb/test/ndbapi/testBasic.cpp:
  merge

  set null bits on delete+insert


storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  set null bits on delete+insert
storage/ndb/test/ndbapi/testBasic.cpp:
  set null bits on delete+insert
  20535
storage/ndb/test/run-test/daily-basic-tests.txt:
  testcase

into  moonbone.local:/mnt/gentoo64/work/test-5.1-opt-mysql


mysql-test/r/func_in.result:
  Auto merged
mysql-test/r/insert_update.result:
  Auto merged
mysql-test/r/type_datetime.result:
  Auto merged
mysql-test/t/insert_update.test:
  Auto merged
mysql-test/t/type_datetime.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/handler.cc:
  Manual merge
sql/item_cmpfunc.cc:
  Manual merge
sql/item_cmpfunc.h:
  Manual merge
sql/item_func.h:
  Manual merge
sql/sql_class.h:
  Manual merge

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


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

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


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

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

  redo extra verification code so that tupkeyref is reset just before tupkeyreq


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  redo extra verification code so that tupkeyref is reset just before tupkeyreq

into  mikael-ronstr-ms-dator.local:/Users/mikron/mysql_clones/mysql-5.1-ndb


config/ac-macros/ha_ndbcluster.m4:
  Auto merged