into mysql.com:/home/stewart/Documents/MySQL/5.0/ndb-dynamic-port
ndb/include/transporter/TransporterRegistry.hpp:
Auto merged
ndb/src/common/transporter/TransporterRegistry.cpp:
Auto merged
ndb/src/kernel/main.cpp:
Auto merged
Add calls to mgmd after setting up connections.
(not fully functional yet, checkin for pull)
ndb/include/mgmcommon/ConfigRetriever.hpp:
add get_mgmHandle() member function
ndb/include/transporter/TransporterRegistry.hpp:
Add remoteNodeId parameter to add_transporter interface
add get_transporter() and get_localNodeID()
these are required for getting the right information out of TransporterRegistry to inform mgmd of what ports we use to connect to other nodes.
ndb/src/common/mgmcommon/IPCConfig.cpp:
call add_transporter_interface with the new nodeId2 parameter
ndb/src/common/transporter/TransporterRegistry.cpp:
Implement additional (remoteNodeId) parameter in add_transporter_interface
Implement get_transporter()
ndb/src/kernel/main.cpp:
Call ndb_mgm_set_connection_int_parameter() to tell mgmd what ports we use to connect to other nodes.
ndb/src/kernel/vm/Configuration.hpp:
add get_config_retriever()
ndb/src/mgmapi/mgmapi.cpp:
Add DBUG_ENTER call to ndb_mgm_set_connection_int_parameter
ndb/src/ndbapi/TransporterFacade.hpp:
Add get_registry()
ndb/src/ndbapi/ndb_cluster_connection.cpp:
Add call to ndb_mgm_set_connection_int_parameter to tell mgmd what ports we use to connect to other nodes.
ndb/test/include/HugoOperations.hpp:
Fix pkRead on ordered index
ndb/test/ndbapi/testPartitioning.cpp:
Update test prg to handled ordered indexes aswell
ndb/test/src/HugoOperations.cpp:
Fix pkRead on ordered index
ndb/test/src/HugoTransactions.cpp:
Fix pkRead on ordered index
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Fix setting of dist keys for ordered indexes
ndb/src/ndbapi/NdbOperationSearch.cpp:
Remove support for combined distribution key and range scan
sql/ha_ndbcluster.cc:
Merge error with wl2126
ndb/include/kernel/AttributeHeader.hpp:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
ndb/test/include/HugoOperations.hpp:
Auto merged
ndb/test/ndbapi/testOIBasic.cpp:
Auto merged
ndb/test/src/HugoOperations.cpp:
Auto merged
ndb/test/src/HugoTransactions.cpp:
Auto merged
ndb/test/src/UtilTransactions.cpp:
Auto merged
ndb/tools/select_count.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
ndb/include/ndbapi/NdbDictionary.hpp:
SCCS merged
ndb/src/ndbapi/NdbDictionary.cpp:
SCCS merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
SCCS merged
ndb/src/common/debugger/signaldata/ScanTab.cpp:
Fix printout
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Set distribution key for ordered indexes
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
Allow create_index_object to modify index_table
ndb/tools/restore/consumer_restore.cpp:
Allow create_index_object to modify index_table
ndb/src/common/debugger/signaldata/ScanTab.cpp:
Fix printout of SCAN_TABREQ
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Set correct status on scanfrag record
ndb/src/ndbapi/NdbScanOperation.cpp:
Fix setting of distribution key wrt scan
ndb/tools/select_count.cpp:
Fix select_count
+more code reuse
+easier testing of indexes
ndb/include/ndbapi/NdbDictionary.hpp:
Remove unimplemented enums
ndb/test/include/HugoOperations.hpp:
Pass index on constructor
ndb/test/include/HugoTransactions.hpp:
Pass index on constructor
ndb/test/include/UtilTransactions.hpp:
Pass index on constructor
ndb/test/src/HugoAsynchTransactions.cpp:
Pass index on constructor
ndb/test/src/HugoOperations.cpp:
Use getOperation to select operation type
ndb/test/src/HugoTransactions.cpp:
Use HugoOpertaions to run transactions
ndb/test/src/UtilTransactions.cpp:
Use HugoOpertaions to run transactions
fix scan take over
ndb/include/kernel/AttributeDescriptor.hpp:
remove deprecated bits
ndb/include/kernel/signaldata/DictTabInfo.hpp:
removed deprecated parameters
moved never implemented to Unimplemented
ndb/src/common/debugger/signaldata/DictTabInfo.cpp:
removed deprecated parameters
moved never implemented to Unimplemented
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
removed deprecated parameters
moved never implemented to Unimplemented
ndb/src/kernel/vm/MetaData.hpp:
removed deprecated parameters
moved never implemented to Unimplemented
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
removed deprecated parameters
moved never implemented to Unimplemented
ndb/src/ndbapi/NdbScanOperation.cpp:
Do scan take over via distribution key code
ndb/docs/wl2077.txt:
Add result from micro benchmark with shm-transporter
ndb/include/transporter/TransporterRegistry.hpp:
Move pid into transporter registry
ndb/src/common/transporter/SHM_Transporter.cpp:
Move pid into transporter registry
ndb/src/common/transporter/TransporterRegistry.cpp:
Move pid into transporter registry
ndb/src/kernel/main.cpp:
Move pid into transporter registry
ndb/src/ndbapi/TransporterFacade.cpp:
Move pid into transporter registry
handled mixed tcp/shm transporters
+ bug#7124
ndb/src/common/transporter/SHM_Transporter.cpp:
Add remote/own pid for signaling availability of data on shm-segment
ndb/src/common/transporter/SHM_Transporter.hpp:
Add remote/own pid for signaling availability of data on shm-segment
ndb/src/common/transporter/TransporterRegistry.cpp:
Add remote/own pid for signaling availability of data on shm-segment
ndb/src/kernel/main.cpp:
Set pid to use for shm-signaling
ndb/src/mgmsrv/ConfigInfo.cpp:
bug#7124
ndb/src/ndbapi/TransporterFacade.cpp:
Set pid to use for shm-signaling
Add facility to report back to ndb_mgmd what port was used for a connection.
We do not actually do the reporting back yet.
ndb/include/mgmapi/mgmapi_debug.h:
Add prototype for ndb_mgm_set_connection_int_parameter
ndb/src/mgmapi/mgmapi.cpp:
Add ndb_mgm_set_connection_int_parameter.
Do 'set connection parameter' ndb_mgm_call
ndb/src/mgmsrv/MgmtSrvr.cpp:
Add MgmtSrvr::setConnectionDbParameter.
Find the connection between node1 and node2,
ndb/src/mgmsrv/MgmtSrvr.hpp:
Add prototype for setConnectionDbParameter
ndb/src/mgmsrv/Services.cpp:
Add 'set connection parameter' cmd and MgmApiSession::setConnectionParameter handler.
ndb/src/mgmsrv/Services.hpp:
add setConnectionParameter prototype.
ndb/include/kernel/AttributeDescriptor.hpp:
wl-1732 support all charsets
ndb/include/kernel/ndb_limits.h:
wl-1732 support all charsets
ndb/include/kernel/signaldata/TuxBound.hpp:
wl-1732 support all charsets
ndb/include/util/NdbSqlUtil.hpp:
wl-1732 support all charsets
ndb/src/common/util/NdbSqlUtil.cpp:
wl-1732 support all charsets
ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
wl-1732 support all charsets
ndb/src/kernel/blocks/dbacc/DbaccInit.cpp:
wl-1732 support all charsets
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
wl-1732 support all charsets
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
wl-1732 support all charsets
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
wl-1732 support all charsets
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
wl-1732 support all charsets
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
wl-1732 support all charsets
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
wl-1732 support all charsets
ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp:
wl-1732 support all charsets
ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
wl-1732 support all charsets
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
wl-1732 support all charsets
ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
wl-1732 support all charsets
ndb/src/kernel/blocks/dbtux/DbtuxCmp.cpp:
wl-1732 support all charsets
ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp:
wl-1732 support all charsets
ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp:
wl-1732 support all charsets
ndb/src/kernel/blocks/dbtux/DbtuxMaint.cpp:
wl-1732 support all charsets
ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp:
wl-1732 support all charsets
ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
wl-1732 support all charsets
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
wl-1732 support all charsets
ndb/src/ndbapi/NdbOperationDefine.cpp:
wl-1732 support all charsets
ndb/src/ndbapi/NdbOperationSearch.cpp:
wl-1732 support all charsets
ndb/src/ndbapi/NdbScanOperation.cpp:
wl-1732 support all charsets
ndb/src/ndbapi/ndberror.c:
wl-1732 support all charsets
ndb/test/ndbapi/Makefile.am:
wl-1732 support all charsets
ndb/test/ndbapi/testOIBasic.cpp:
wl-1732 support all charsets
ndb/tools/desc.cpp:
wl-1732 support all charsets
ndb/include/kernel/ndb_limits.h:
#define for max null bits
ndb/include/kernel/signaldata/TupFrag.hpp:
Error code for too many nullbits
ndb/include/util/Bitmask.hpp:
Cosmetic fix
ndb/src/common/util/Bitmask.cpp:
handle (pos % 32) == 0
more unit tests
ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
Check bitmask overflow
ndb/src/ndbapi/ndberror.c:
New error code
ndb/test/ndbapi/testBitfield.cpp:
Update test program
ndb/test/run-test/daily-basic-tests.txt:
Add testBitfield to autotest
ndb/src/common/util/Bitmask.cpp:
Bug fixes + better unit test
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
fix
ndb/test/ndbapi/testBitfield.cpp:
impl. create_random_table and transactions
ndb/test/src/HugoCalculator.cpp:
Only use "var" size when var-size
ndb/test/include/HugoCalculator.hpp:
Fix calcValue for bits
ndb/test/src/HugoCalculator.cpp:
Fix calcValue for bits
ndb/test/src/HugoOperations.cpp:
Fix calcValue for bits
ndb/test/tools/Makefile.am:
Fix calcValue for bits
ndb/include/kernel/AttributeHeader.hpp:
Add pseudo column for row size
ndb/include/ndbapi/NdbDictionary.hpp:
Add pseudo column for row size
ndb/include/util/Bitmask.hpp:
Remove assert which was not needed
ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
Missing break
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
1) New pseudo column ROW_SIZE
2) Fix bug in Bit columns
ndb/src/ndbapi/NdbDictionary.cpp:
Fix prinout of bit column
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Bug fix Bit column
ndb/src/ndbapi/NdbRecAttr.cpp:
Fix prinout of bit column
ndb/test/src/HugoCalculator.cpp:
Bit enable Hugo
ndb/test/src/HugoOperations.cpp:
Bit enable Hugo
ndb/test/src/NDBT_Tables.cpp:
Bit enable Hugo
All our programs which use mysql_real_connect() and mysql_connect() are updated accordingly, though I have deliberately
made mysqlimport not reconnect anymore (already true for mysqldump >= 4.1.8).
All Connector devs have been warned about the change I'm doing here - which was agreed with Monty,
and fixes BUG#2555.
VC++Files/libmysqltest/mytest.c:
explicit mention of reconnect (no behaviour change)
VC++Files/mysqlmanager/mysqlmanagerview.cpp:
explicit mention of reconnect (no behaviour change)
VC++Files/test1/mysql_thr.c:
explicit mention of reconnect (no behaviour change)
VC++Files/winmysqladmin/main.cpp:
explicit mention of reconnect (no behaviour change)
client/mysql.cc:
explicit mention of reconnect if embedded (no behaviour change)
client/mysqladmin.cc:
explicit mention of reconnect (no behaviour change)
client/mysqlbinlog.cc:
explicit mention of reconnect (no behaviour change)
client/mysqlcheck.c:
explicit mention of reconnect (no behaviour change)
client/mysqlimport.c:
explicit mention of NO reconnect (behaviour change). As most time is passed in LOAD DATA INFILE,
and as it does not make sense to reconnect after a partly failed LOAD... And as mysqlimport sometimes
does LOCK TABLES where we mustn't reconnect...
client/mysqlshow.c:
explicit mention of reconnect (no behaviour change)
client/mysqltest.c:
explicit mention of reconnect (no behaviour change).
Normally we should not reconnect (it's not good to have silent reconnection in the middle of a test),
but 5.0 is too touchy to change it now. I'm marking it TODO.
libmysql/libmysql.c:
explicit mention of reconnect (no behaviour change)
libmysqld/examples/builder-sample/emb_samples.cpp:
explicit mention of reconnect (no behaviour change)
ndb/test/ndbapi/flex_bench_mysql.cpp:
explicit mention of reconnect (no behaviour change)
ndb/tools/restore/consumer_restorem.cpp:
explicit mention of reconnect (no behaviour change)
sql-common/client.c:
Changing the default of libmysqlclient : it's now NO reconnection.
sql/repl_failsafe.cc:
explicit mention of reconnect (no behaviour change)
sql/slave.cc:
explicit mention of reconnect (no behaviour change)
tests/client_test.c:
explicit mention of reconnect (no behaviour change)
tests/connect_test.c:
explicit mention of reconnect (no behaviour change)
tests/deadlock_test.c:
explicit mention of reconnect (no behaviour change)
tests/insert_test.c:
explicit mention of reconnect (no behaviour change)
tests/list_test.c:
explicit mention of reconnect (no behaviour change)
tests/select_test.c:
explicit mention of reconnect (no behaviour change)
tests/showdb_test.c:
explicit mention of reconnect (no behaviour change)
tests/ssl_test.c:
explicit mention of reconnect (no behaviour change)
tests/thread_test.c:
explicit mention of reconnect (no behaviour change)
tools/mysqlmanager.c:
explicit mention of reconnect (no behaviour change)
into mysql.com:/home/jonas/src/mysql-5.0
ndb/src/kernel/blocks/backup/Backup.cpp:
Auto merged
ndb/src/kernel/blocks/backup/Backup.hpp:
Auto merged
ndb/src/kernel/blocks/backup/BackupInit.cpp:
Auto merged
ndb/tools/restore/restore_main.cpp:
Auto merged
created by 4.1.7 as bugfix changed binary format
ndb/tools/restore/Restore.cpp:
Fixed so that version 4.1.8 of restore can read
files created by 4.1.7
ndb/tools/restore/Restore.hpp:
Fixed so that version 4.1.8 of restore can read
files created by 4.1.7
ndb/tools/restore/main.cpp:
Fixed so that version 4.1.8 of restore can read
files created by 4.1.7
don't store keys in normalized form
instead save everythings as normal attributes
ndb/src/kernel/blocks/backup/Backup.cpp:
Remove special handling of keys, that was build to support
tables where keys was only stored in ACC
ndb/src/kernel/blocks/backup/Backup.hpp:
Remove special handling of keys, that was build to support
tables where keys was only stored in ACC
ndb/src/kernel/blocks/backup/BackupInit.cpp:
Remove special handling of keys, that was build to support
tables where keys was only stored in ACC
ndb/tools/restore/Restore.cpp:
Remove special handling of keys, that was build to support
tables where keys was only stored in ACC
ndb/tools/restore/Restore.hpp:
Remove special handling of keys, that was build to support
tables where keys was only stored in ACC
ndb/src/ndbapi/TransporterFacade.cpp:
Remove dead #if 0'd out condition with misleading comment
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
ndb/include/Makefile.am:
remove result set
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Fix so that noOfFiredTriggers aren't overwritten during scans
sql/ha_ndbcluster.cc:
1) Fix bugs in completed read_multi_range
2) Change buffer handling so range scan are always put last in buffer
This to support restart of scan
sql/ha_ndbcluster.h:
1) Fix bugs in completed read_multi_range
2) Change buffer handling so range scan are always put last in buffer
This to support restart of scan
ndb/include/util/Bitmask.hpp:
Add general set/getField
ndb/src/common/util/Bitmask.cpp:
Test program for bitmask
ndb/src/common/util/Makefile.am:
Test program for bitmask