into mysql.com:/home/jonas/src/wl2126
ndb/include/ndbapi/NdbDictionary.hpp:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
Auto merged
into mysql.com:/home/jonas/src/wl1744
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
ndb/include/Makefile.am:
Auto merged
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
Auto merged
ndb/src/common/util/version.c:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
Auto merged
ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
ndb/src/mgmsrv/main.cpp:
Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
ndb/include/util/Bitmask.hpp:
New methods for working with bit fields of
arbitrary size
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
Use BitmaskImpl at all time (in BitField operations)
into mysql.com:/home/jonas/src/wl2126
ndb/include/ndbapi/NdbScanOperation.hpp:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
ndb/test/ndbapi/testScanPerf.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
ndb/include/kernel/AttributeHeader.hpp:
Added range_no pseudo column
ndb/include/ndbapi/NdbDictionary.hpp:
Added range_no pseudo column
ndb/include/ndbapi/NdbIndexScanOperation.hpp:
Add support for reading range_no
ndb/include/ndbapi/NdbReceiver.hpp:
Add support for reading range_no
ndb/include/ndbapi/NdbScanOperation.hpp:
Add support for reading range_no
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
Added range_no pseudo column
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Added range_no pseudo column
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
Added range_no pseudo column
ndb/src/ndbapi/NdbDictionary.cpp:
Added range_no pseudo column
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Added range_no pseudo column
ndb/src/ndbapi/NdbReceiver.cpp:
Add support for reading range_no
ndb/src/ndbapi/NdbScanOperation.cpp:
Read range no
sql/ha_ndbcluster.cc:
Set correct found_p using new feature read_range_no
sql/ha_ndbcluster.h:
Set correct found_p using new feature read_range_no
ndb/include/kernel/signaldata/DictTabInfo.hpp:
Add bit type
ArraySize is used to specify no of bits
ndb/include/ndbapi/NdbDictionary.hpp:
Add bit type
ndb/include/util/NdbSqlUtil.hpp:
Add bit type
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Add bit type
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
Add bit type
ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
Add bit type
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
Add bit type
mysql-test/r/ndb_read_multi_range.result:
Add tests of null handling to read_multi
mysql-test/t/ndb_read_multi_range.test:
Add tests of null handling to read_multi
ndb/include/ndbapi/NdbOperation.hpp:
Get recattr
ndb/include/ndbapi/NdbRecAttr.hpp:
Get recattr
sql/ha_ndbcluster.cc:
Fix handling of null values wrt read multi range
sql/ha_ndbcluster.h:
Fix handling of null values wrt read multi range
client/mysqldump.c:
Auto merged
innobase/include/row0mysql.h:
Auto merged
innobase/lock/lock0lock.c:
Auto merged
innobase/row/row0mysql.c:
Auto merged
innobase/row/row0sel.c:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
mysql-test/r/ndb_index_unique.result:
Auto merged
mysql-test/r/rpl_start_stop_slave.result:
Auto merged
mysql-test/t/mysqldump.test:
Auto merged
mysql-test/t/ndb_grant.later:
Auto merged
mysql-test/t/ndb_index_unique.test:
Auto merged
ndb/include/ndbapi/NdbScanOperation.hpp:
Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
ndb/test/ndbapi/testScanPerf.cpp:
Auto merged
netware/comp_err.def:
Auto merged
netware/isamchk.def:
Auto merged
netware/isamlog.def:
Auto merged
netware/libmysql.def:
Auto merged
netware/my_print_defaults.def:
Auto merged
netware/myisam_ftdump.def:
Auto merged
netware/myisamchk.def:
Auto merged
netware/myisamlog.def:
Auto merged
netware/myisampack.def:
Auto merged
netware/mysql.def:
Auto merged
netware/mysql_install.def:
Auto merged
netware/mysql_install_db.def:
Auto merged
netware/mysql_test_run.def:
Auto merged
netware/mysql_waitpid.def:
Auto merged
netware/mysqladmin.def:
Auto merged
netware/mysqlbinlog.def:
Auto merged
netware/mysqlcheck.def:
Auto merged
netware/mysqld.def:
Auto merged
netware/mysqld_safe.def:
Auto merged
netware/mysqldump.def:
Auto merged
netware/mysqlimport.def:
Auto merged
netware/mysqlshow.def:
Auto merged
netware/mysqltest.def:
Auto merged
netware/pack_isam.def:
Auto merged
netware/perror.def:
Auto merged
netware/replace.def:
Auto merged
netware/resolve_stack_dump.def:
Auto merged
netware/resolveip.def:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
client/mysqladmin.cc:
Merge for Netware changes. Indention fixes.
sql/field.cc:
Merge fixes, warnings added from 4.1 to 5.0
sql/mysqld.cc:
Merge fixes, just indention fixes.
added extra calls to retrieve connectstring used
reengineered connect somewhat to make retries etc explicit
mysql-test/r/ndb_index_unique.result:
fixed error in test result
ndb/include/mgmapi/mgmapi.h:
added extra calls to retrieve connectstring used
ndb/include/mgmcommon/ConfigRetriever.hpp:
added extra calls to retrieve connectstring used
ndb/include/ndbapi/ndb_cluster_connection.hpp:
added extra calls to retrieve connectstring used
reengineered connect somewhat to make retries etc explicit
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
added extra calls to retrieve connectstring used
ndb/src/mgmapi/mgmapi.cpp:
added extra calls to retrieve connectstring used
ndb/src/mgmclient/CommandInterpreter.cpp:
moved parse of quit to avoid connect before
ndb/src/ndbapi/Ndbinit.cpp:
reengineered connect somewhat to make retries etc explicit
ndb/src/ndbapi/ndb_cluster_connection.cpp:
added extra calls to retrieve connectstring used
reengineered connect somewhat to make retries etc explicit
ndb/tools/listTables.cpp:
reengineered connect somewhat to make retries etc explicit
sql/ha_ndbcluster.cc:
added extra calls to retrieve connectstring used
reengineered connect somewhat to make retries etc explicit
added new error type "configuration or application error"
Added check if backup is issued during diskless mode, backup refuse returned
added possibility to get error code as a result from management client
addded possibility to set connecstring with CONNECT command
changed to use strcasecmp instead of strcmp
added possibility to run one command on cammand client to ndb_mgm and get an errorcode of command fails
made thread safe veriosn of getErrorText in management server
aligned backup errorcodes with rest of ndb error codes giving it range from 1300
print error message from regular ndberror struct
added new arrer type "cofiguration or application error"
commented on allocaded ranges for errors
ndb/include/kernel/signaldata/BackupImpl.hpp:
aligned backup errorcodes with rest of ndb error codes giving it range from 1300
ndb/include/kernel/signaldata/BackupSignalData.hpp:
aligned backup errorcodes with rest of ndb error codes giving it range from 1300
ndb/include/ndbapi/ndberror.h:
added new error type "configuration or application error"
ndb/src/kernel/blocks/backup/Backup.cpp:
Added check if backup is issued during diskless mode, backup refuse returned
ndb/src/kernel/blocks/backup/Backup.hpp:
member variable in backup block to indicate diskless or not
ndb/src/kernel/blocks/backup/BackupInit.cpp:
Added check if backup is issued during diskless mode, backup refuse returned
ndb/src/mgmclient/CommandInterpreter.cpp:
added possibility to get error code as a result from management client
addded possibility to set connecstring with CONNECT command
changed to use strcasecmp instead of strcmp
ndb/src/mgmclient/main.cpp:
added possibility to run one command on cammand client to ndb_mgm and get an errorcode of command fails
ndb/src/mgmclient/ndb_mgmclient.hpp:
added possibility to get error code as a result from management client
ndb/src/mgmsrv/CommandInterpreter.cpp:
made thread safe veriosn of getErrorText in management server
ndb/src/mgmsrv/CommandInterpreter.hpp:
made thread safe veriosn of getErrorText in management server
ndb/src/mgmsrv/MgmtSrvr.cpp:
aligned backup errorcodes with rest of ndb error codes giving it range from 1300
print error message from regular ndberror struct
ndb/src/mgmsrv/MgmtSrvr.hpp:
made thread safe veriosn of getErrorText in management server
ndb/src/mgmsrv/Services.cpp:
made thread safe veriosn of getErrorText in management server
ndb/src/mgmsrv/Services.hpp:
made thread safe veriosn of getErrorText in management server
ndb/src/ndbapi/ndberror.c:
added new arrer type "cofiguration or application error"
commented on allocaded ranges for errors
aligned backup errors with rest of errors
ndb/include/ndbapi/NdbScanOperation.hpp:
Improved doc. a bit
ndb/src/ndbapi/NdbConnectionScan.cpp:
Set error code
ndb/src/ndbapi/NdbScanOperation.cpp:
Check error directly after taking mutex
ndb/test/ndbapi/testScan.cpp:
new scan test with lots of threads
ndb/test/run-test/daily-basic-tests.txt:
Added two more scan tests
Collapsed testTransactions & testOperations
into poseidon.ndb.mysql.com:/home/tomas/wl2126
ndb/src/ndbapi/NdbConnection.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
ndb/include/ndbapi/NdbScanOperation.hpp:
Auto merged
ndb/src/common/util/version.c:
Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
Auto merged
ndb/test/ndbapi/testReadPerf.cpp:
Auto merged
ndb/test/ndbapi/testScanPerf.cpp:
Auto merged
into mysql.com:/home/jonas/src/wl2126
ndb/include/ndbapi/NdbConnection.hpp:
Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
into mysql.com:/home/jonas/src/mysql-5.0-ndb
ndb/include/ndbapi/NdbConnection.hpp:
Auto merged
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
Auto merged
ndb/include/ndbapi/NdbConnection.hpp:
fix blob performance in long transactions
ndb/src/ndbapi/NdbConnection.cpp:
fix blob performance in long transactions
ndb/test/ndbapi/testBlobs.cpp:
fix blob performance in long transactions
prepared for using query cache in ndb
ndb/include/ndbapi/NdbIndexScanOperation.hpp:
added force send interface to scan
ndb/include/ndbapi/NdbResultSet.hpp:
added force send interface to scan
ndb/include/ndbapi/NdbScanOperation.hpp:
added force send interface to scan
ndb/src/ndbapi/NdbResultSet.cpp:
added force send interface to scan
ndb/src/ndbapi/NdbScanOperation.cpp:
added force send interface to scan
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-mysqladmin
ndb/src/kernel/vm/Configuration.cpp:
Auto merged
ndb/src/mgmclient/main.cpp:
Auto merged
ndb/src/mgmsrv/main.cpp:
Auto merged
ndb/tools/restore/restore_main.cpp:
Auto merged
ndb/tools/select_all.cpp:
Auto merged
ndb/tools/waiter.cpp:
Auto merged
assigned "localhost" as default connectstring
added a disconnect() first in connect()
removed double implementation of connect code, use connect() in NdbRestarter
removed extra "host=" in connectstring
ndb/include/mgmapi/mgmapi.h:
removed wrong comment
ndb/test/include/NdbRestarter.hpp:
removed unused variables
ndb/test/src/NdbBackup.cpp:
removed double implementation of connect code, use connect() in NdbRestarter
removed extra "host=" in connectstring
ndb/test/src/NdbRestarter.cpp:
removed unused variables
assigned "localhost" as default connectstring
added a disconnect() first in connect()
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
Auto merged
ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
Auto merged
ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp:
Auto merged
ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
into mysql.com:/home/jonas/src/wl2126
ndb/include/ndbapi/NdbConnection.hpp:
Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
client/Makefile.am:
Auto merged
client/mysqladmin.cc:
Auto merged
configure.in:
Auto merged
ndb/src/mgmclient/CommandInterpreter.cpp:
Auto merged
ndb/src/mgmclient/ndb_mgmclient.hpp:
Auto merged
ndb/src/mgmclient/ndb_mgmclient.h:
Auto merged
ndb/tools/restore/restore_main.cpp:
SCCS merged
.c -> .cc
fix source dist problem for ndb
fix type check problem for mysqladmin
client/Makefile.am:
fix for mysqladmin link problem
.c -> .cc
client/mysqladmin.cc:
fix for mysqladmin link problem
.c -> .cc
configure.in:
fix for mysqladmin link problem
.c -> .cc
ndb/include/Makefile.am:
fix source dist problem for ndb
ndb/src/mgmclient/CommandInterpreter.cpp:
fix type check problem
ndb/src/mgmclient/ndb_mgmclient.hpp:
fix type check problem
ndb/src/mgmclient/ndb_mgmclient.h:
fix type check problem
no need for dvlags to have DEFINE_CXA_PURE_VIRTUAL anymore
aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
removed all dependencies of LocalConfig, except for mgmapi internals
enabled multiple management servrs to fetch data configurations from eachother
client/Makefile.am:
changed mysqladmin.c to mysqladmin.cc
client/mysqladmin.cc:
changed mysqladmin.c to mysqladmin.cc
configure.in:
no need for dvlags to have DEFINE_CXA_PURE_VIRTUAL anymore
ndb/include/mgmapi/mgmapi.h:
aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
removed all dependencies of LocalConfig, except for mgmapi internals
ndb/include/mgmcommon/ConfigRetriever.hpp:
aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
removed all dependencies of LocalConfig, except for mgmapi internals
ndb/include/ndbapi/ndb_cluster_connection.hpp:
aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
removed all dependencies of LocalConfig, except for mgmapi internals
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
removed all dependencies of LocalConfig, except for mgmapi internals
ndb/src/kernel/main.cpp:
aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
removed all dependencies of LocalConfig, except for mgmapi internals
ndb/src/kernel/vm/Configuration.cpp:
aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
removed all dependencies of LocalConfig, except for mgmapi internals
changed to config setting to always use noOfMetaTables to make sure we don't overflow arrays
ndb/src/kernel/vm/Configuration.hpp:
aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
removed all dependencies of LocalConfig, except for mgmapi internals
ndb/src/mgmapi/LocalConfig.cpp:
aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
removed all dependencies of LocalConfig, except for mgmapi internals
ndb/src/mgmapi/LocalConfig.hpp:
aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
removed all dependencies of LocalConfig, except for mgmapi internals
ndb/src/mgmapi/mgmapi.cpp:
aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
removed all dependencies of LocalConfig, except for mgmapi internals
ndb/src/mgmclient/CommandInterpreter.cpp:
aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
removed all dependencies of LocalConfig, except for mgmapi internals
ndb/src/mgmclient/main.cpp:
aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
removed all dependencies of LocalConfig, except for mgmapi internals
ndb/src/mgmclient/ndb_mgmclient.hpp:
aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
removed all dependencies of LocalConfig, except for mgmapi internals
ndb/src/mgmclient/ndb_mgmclient.h:
aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
removed all dependencies of LocalConfig, except for mgmapi internals
ndb/src/mgmsrv/MgmtSrvr.cpp:
aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
removed all dependencies of LocalConfig, except for mgmapi internals
enabled multiple management servrs to fetch data configurations from eachother
ndb/src/mgmsrv/MgmtSrvr.hpp:
aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
removed all dependencies of LocalConfig, except for mgmapi internals
ndb/src/mgmsrv/MgmtSrvrConfig.cpp:
aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
removed all dependencies of LocalConfig, except for mgmapi internals
ndb/src/mgmsrv/main.cpp:
aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
removed all dependencies of LocalConfig, except for mgmapi internals
ndb/src/ndbapi/ndb_cluster_connection.cpp:
aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
removed all dependencies of LocalConfig, except for mgmapi internals
ndb/tools/waiter.cpp:
aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
removed all dependencies of LocalConfig, except for mgmapi internals
ndb/include/kernel/signaldata/ArbitSignalData.hpp:
new arbitrator behaviour for >=3-way: < 1/2 nodes can survive
ndb/src/common/debugger/EventLogger.cpp:
new arbitrator behaviour for >=3-way: < 1/2 nodes can survive
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
new arbitrator behaviour for >=3-way: < 1/2 nodes can survive
ndb/include/ndbapi/NdbConnection.hpp:
Utility methods
ndb/include/ndbapi/NdbOperation.hpp:
Utility methods
ndb/src/ndbapi/NdbConnection.cpp:
Don't set theReturnStatus all_the_time, but let it be decided on
a operation bases
ndb/src/ndbapi/NdbOperationExec.cpp:
AbortOption
sql/ha_ndbcluster.cc:
1) removed execute from define_read_attr
2) let a bunch of methods use define_read_attr
3) impl. read_multi_range
sql/ha_ndbcluster.h:
read_multi_range
configure.in:
Auto merged
ndb/src/Makefile.am:
Auto merged
ndb/src/common/mgmcommon/Makefile.am:
Auto merged
ndb/src/common/portlib/Makefile.am:
Auto merged
ndb/src/common/portlib/NdbConfig.c:
Auto merged
ndb/src/common/transporter/TransporterRegistry.cpp:
Auto merged
ndb/src/kernel/blocks/backup/Makefile.am:
Auto merged
ndb/src/mgmapi/Makefile.am:
Auto merged
ndb/src/mgmclient/Makefile.am:
Auto merged
ndb/tools/Makefile.am:
Auto merged
- new test program
- changed scan take over protocol
- fixed some bugs
ndb/include/kernel/signaldata/TcKeyReq.hpp:
Changed scan takeover to instead
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
return fargment instead of node (as info for scan take-over)
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
remove unused scanNode
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Ship fragment instead of node in scan take over.
The case where fragment has changed primary will still be handled
as fragmentdistribution has changed then
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
Send fragment wo/ extra bit
ndb/src/ndbapi/NdbOperationSearch.cpp:
Fix distribution key length
ndb/test/ndbapi/Makefile.am:
new test program for partitioning
