make previous patch portable by abstracting to Ndb_check_socket_hup.
Is in portlib rather than mysys due to the socket parameter being NDB_SOCKET_TYPE
ndb/include/portlib/NdbTCP.h:
Add Ndb_check_socket_hup prototype
ndb/src/common/portlib/NdbTCP.cpp:
Implement Ndb_check_socket_hup for unix like systems using the poll system call.
ndb/src/common/portlib/win32/NdbTCP.c:
Implement Ndb_check_socket_hup(NDB_SOCKET_TYPE) for win32 using the select() call.
(should work okay - unable to test on win32 due to status of ndb port though)
ndb/src/mgmapi/mgmapi.cpp:
Use the portable (portlib) Ndb_check_socket_hup to check socket status
Removed ending comma in enum
Makefile.am:
config.cpp => ndb_config.cpp, solves link problems on case insensitive OS
ndb_config.cpp:
Rename: ndb/tools/config.cpp -> ndb/tools/ndb_config.cpp
ndb/tools/ndb_config.cpp:
Rename: ndb/tools/config.cpp -> ndb/tools/ndb_config.cpp
ndb/tools/Makefile.am:
config.cpp => ndb_config.cpp, solves link problems on case insensitive OS
client/client_priv.h:
Removed ending comma in enum
- Moved a few DBUG_ENTER statements after the variable declarations to satisfy some
compilers (e.g. gcc-2.95.x, gcc-2.96, IBM xlc_r) in ndb/src/common/portlib/NdbMutex.c
and ndb/src/common/portlib/NdbThread.c
- portability fix for FreeBSD 4.x and HPUX: replaced atoll() with strtoll() in
ndb/tools/config.cpp
ndb/src/common/portlib/NdbMutex.c:
- Moved a few DBUG_ENTER statements after the variable declarations to satisfy some
compilers (e.g. gcc-2.95.x, gcc-2.96, IBM xlc_r)
ndb/src/common/portlib/NdbThread.c:
- Moved a DBUG_ENTER statement after the variable declarations to satisfy some
compilers (e.g. gcc-2.95.x, gcc-2.96, IBM xlc_r)
ndb/tools/config.cpp:
- portability fix for FreeBSD 4.x and HPUX: replaced atoll() with strtoll()
into mysql.com:/home/jonas/src/mysql-5.0
ndb/include/mgmapi/mgmapi_config_parameters.h:
Auto merged
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
Auto merged
ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
into mysql.com:/home/jonas/src/mysql-4.1-push
ndb/src/mgmapi/mgmapi.cpp:
Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
ndb/src/mgmsrv/ConfigInfo.hpp:
Auto merged
ndb/include/mgmapi/mgmapi_config_parameters.h:
Fix LCP during SR parameters
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
Fix LCP during SR parameters
ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
Fix LCP during SR parameters
ndb/src/mgmsrv/ConfigInfo.cpp:
Fix LCP during SR parameters
into mysql.com:/home/jonas/src/mysql-5.0
ndb/include/mgmapi/mgmapi.h:
Auto merged
ndb/src/mgmsrv/ConfigInfo.hpp:
Auto merged
ndb/src/mgmapi/mgmapi.cpp:
merge
ndb/tools/Makefile.am:
merge
ndb/include/mgmapi/mgmapi.h:
Add feature to redirect error printouts
ndb/src/mgmapi/mgmapi.cpp:
Add feature to redirect error printouts
ndb/src/mgmsrv/ConfigInfo.hpp:
Make param info public
ndb/tools/Makefile.am:
Add ndb_config
ndb/tools/config.cpp:
New BitKeeper file ``ndb/tools/config.cpp''
ndb/test/include/UtilTransactions.hpp:
Fix closeTransaction in testPartitioning
ndb/test/src/HugoOperations.cpp:
Fix closeTransaction in testPartitioning
ndb/test/src/UtilTransactions.cpp:
Fix closeTransaction in testPartitioning
fix test case
improve testing
ndb/test/include/HugoOperations.hpp:
Partial write (only pk)
ndb/test/ndbapi/testNdbApi.cpp:
improve testcase
use writePartial to verify that ops get correctly converted
(also test negative)
ndb/test/src/HugoOperations.cpp:
write partial + improve prinout in wait_async
into mysql.com:/home/stewart/Documents/MySQL/5.0/bug10950
ndb/src/common/transporter/TransporterRegistry.cpp:
Auto merged
ndb/src/mgmapi/mgmapi.cpp:
manual merge.
Reset missed heartbeat count on receipt of signal from node.
This fixes a bug where that under high network load, the heartbeat packets could be
delayed, causing the appearance of node failure (due to lost heartbeats).
ndb/include/kernel/NodeInfo.hpp:
Add m_heartbeat_cnt to track missed heartbeats
ndb/include/transporter/TransporterCallback.hpp:
add prototype for transporter_recv_from()
Called on receipt from a node.
ndb/src/common/transporter/TransporterRegistry.cpp:
Add calls to transporter_receive_from when data is received (before unpack)
ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
remove NodeRec::alarmCount. missed heartbeat count now kept in NodeInfo
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
Use NodeInfo::m_heartbeat_cnt for missed heartbeat count
ndb/src/kernel/vm/TransporterCallback.cpp:
add transporter_recv_from(), which is called on receipt of signals.
It resets missed heartbeat count for that node.
ndb/src/ndbapi/ClusterMgr.cpp:
Use NodeInfo::m_heartbeat_cnt for missed heartbeat count
ndb/src/ndbapi/ClusterMgr.hpp:
Use NodeInfo::m_heartbeat_cnt instead of ClusterMgr::Node::hbSent for missed
heartbeat count.
We now use the same storage for API and Kernel heartbeats.
Add ClusterMgr::hb_received(nodeId) to reset hbSent (as if we received a heartbeat,
but callable from elsewhere - e.g. when signal received)
ndb/src/ndbapi/TransporterFacade.cpp:
Implement transporter_recv_from for ndbapi - which resets hbSent
ndb/src/ndbapi/TransporterFacade.hpp:
Add hb_received(nodeId)
into mysql.com:/home/jonas/src/mysql-5.0-push
ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
Auto merged
ndb/tools/restore/restore_main.cpp:
Auto merged
Fix invalid backup log when using #nodes != 2^x
Fix ndb_restore --printXXX options
(among other init counters)
ndb/src/kernel/blocks/backup/Backup.cpp:
remove frag_mask since in 5.0 extra frag bit in in bit 0
ndb/src/kernel/blocks/backup/Backup.hpp:
remove frag_mask since in 5.0 extra frag bit in in bit 0
ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
send "real" frag id to backup
ndb/tools/restore/Restore.cpp:
Changed prinout (since it's wrong if you only print stuff)
ndb/tools/restore/consumer_printer.hpp:
Init log/data count in printer
ndb/tools/restore/restore_main.cpp:
Fix if-statements
for correct handling of ndb_restore flags
into mysql.com:/home/jonas/src/mysql-5.0-push
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
into mysql.com:/home/jonas/src/mysql-5.0
ndb/include/kernel/signaldata/DictTabInfo.hpp:
Auto merged
ndb/include/ndbapi/NdbDictionary.hpp:
Auto merged
ndb/src/kernel/blocks/backup/Backup.cpp:
Auto merged
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
Auto merged
ndb/src/kernel/blocks/ndbfs/MemoryChannel.hpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
ndb/test/ndbapi/testBackup.cpp:
Auto merged
ndb/test/ndbapi/testNdbApi.cpp:
Auto merged
ndb/test/run-test/daily-basic-tests.txt:
Auto merged
ndb/tools/drop_index.cpp:
Auto merged
ndb/tools/listTables.cpp:
Auto merged
ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
merge
ndb/src/ndbapi/ndberror.c:
merge
ndb/test/include/HugoOperations.hpp:
merge
ndb/test/src/HugoOperations.cpp:
merge
fix error code to avoid clash with 5.0/5.1
ndb/include/kernel/signaldata/AlterTable.hpp:
Change error codes to remove clash from 5.0
ndb/include/kernel/signaldata/DropTable.hpp:
Change error codes to remove clash from 5.0
ndb/src/ndbapi/ndberror.c:
Change error codes to remove clash from 5.0
ndb/include/kernel/signaldata/AlterTable.hpp:
Add error code for backup in progress
ndb/include/kernel/signaldata/DictTabInfo.hpp:
Add backup state
ndb/include/kernel/signaldata/DropTable.hpp:
Add error code for backup in progress
ndb/include/ndbapi/NdbDictionary.hpp:
Add backup state
ndb/src/kernel/blocks/backup/Backup.cpp:
1) remove invalid require (util_sequence_ref) crash
2) Don't backup objects dropping/creating
3) set correct error code on backup fragment ref (crash)
4) save TrigAttrInfo header when getting log full (crash)
5) lock/unlock tables during backup
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
1) add mutex lock/unlock as part of drop/alter table
2) add lock/unlock for backup
3) remove TC from backup trigger loop
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
Add BACKUP_ONGOING state
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Add backup state
ndb/src/ndbapi/ndberror.c:
Add error code for backup in progress
ndb/test/ndbapi/testBackup.cpp:
Add testcase for testBackup -n BackupDDL
ndb/tools/drop_index.cpp:
Fix ndb_drop_index
ndb/tools/listTables.cpp:
Print of backup state
into mysql.com:/home/jimw/my/mysql-5.0-clean
extra/perror.c:
Auto merged
include/my_global.h:
Auto merged
mysql-test/r/ps_1general.result:
Auto merged
mysql-test/r/ps_2myisam.result:
Auto merged
mysql-test/r/ps_3innodb.result:
Auto merged
mysql-test/r/ps_4heap.result:
Auto merged
mysql-test/r/ps_5merge.result:
Auto merged
mysql-test/r/ps_6bdb.result:
Auto merged
mysql-test/r/ps_7ndb.result:
Auto merged
mysql-test/r/select.result:
Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
ndb/src/mgmsrv/main.cpp:
Auto merged
sql/des_key_file.cc:
Auto merged
sql/field_conv.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_select.cc:
Auto merged
tests/mysql_client_test.c:
Auto merged
mysql-test/t/select.test:
Resolve conflicts
scripts/mysqld_safe.sh:
Resolve conflict
sql/item.cc:
Resolve conflict, don't return FIELD_TYPE_BLOB since VARCHAR
can be longer in 5.0 than 4.1.
sql/log_event.cc:
Resolve conflict
sql/mysql_priv.h:
Resolve conflict
sql/mysqld.cc:
Remove incorrect fix (merge from 4.1)
sql/sql_show.cc:
Resolve conflict
BUG#12028, cannot use default section for hostname in cluster config
made clearer error message
ndb/src/mgmsrv/ConfigInfo.cpp:
BUG#12028, cannot use default section for hostname in cluster config
made clearer error message
ndb/src/kernel/blocks/ERROR_codes.txt:
fix some bugs in protocols drop index etc
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
fix some bugs in protocols drop index etc
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
fix some bugs in protocols drop index etc
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
fix some bugs in protocols drop index etc
ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
fix some bugs in protocols drop index etc
