review comment
if some tcp-transporter has data, then do select with timeout 0
ndb/src/common/transporter/TransporterRegistry.cpp:
review comment
if some tcp-transporter has data, then do select with timeout 0
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
storage/ndb/src/common/transporter/TCP_Transporter.hpp:
Auto merged
storage/ndb/src/common/transporter/TransporterRegistry.cpp:
Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
Auto merged
storage/ndb/test/ndbapi/testNdbApi.cpp:
merge
into perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
storage/ndb/src/common/transporter/Packer.cpp:
Auto merged
storage/ndb/src/common/transporter/TCP_Transporter.hpp:
Auto merged
storage/ndb/src/common/transporter/TransporterRegistry.cpp:
Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
Auto merged
storage/ndb/test/ndbapi/testNdbApi.cpp:
merge
storage/ndb/test/run-test/daily-basic-tests.txt:
merge
into perch.ndb.mysql.com:/home/jonas/src/50-work
ndb/src/common/transporter/Packer.cpp:
Auto merged
ndb/src/common/transporter/TCP_Transporter.hpp:
Auto merged
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
Auto merged
ndb/src/common/transporter/TransporterRegistry.cpp:
merge
ndb/test/ndbapi/testNdbApi.cpp:
merge
ndb/test/run-test/daily-basic-tests.txt:
merge
Make sure that data can not e left lingering in receive buffer
ndb/src/common/transporter/Packer.cpp:
test, make MAX_RECEIVED_SIGNALS an variable
ndb/src/common/transporter/TCP_Transporter.hpp:
add new method for checking of data in receive buffer
ndb/src/common/transporter/TransporterRegistry.cpp:
Make sure that
1) poll_TCP return true if any transporter has data in receiveBuffer
(previously only if socket had data)
2) performReceive executes signals if TCP transporter has data in receiveBuffer
(previously only if data was recevied)
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
test, make MAX_RECEIVED_SIGNALS an variable
ndb/test/ndbapi/testNdbApi.cpp:
testcase
ndb/test/run-test/daily-basic-tests.txt:
testcase
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
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 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 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
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
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.
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
