into mysql.com:/home/jonas/src/wl2077
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
Auto 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/src/common/util/NdbSqlUtil.cpp:
charset fix from Bar (strxfrm_multiply can be 0)
ndb/src/ndbapi/NdbIndexOperation.cpp:
charset fix from Bar (strxfrm_multiply can be 0)
ndb/src/ndbapi/NdbOperationSearch.cpp:
charset fix from Bar (strxfrm_multiply can be 0)
ndb/src/ndbapi/NdbScanOperation.cpp:
charset fix from Bar (strxfrm_multiply can be 0)
client/Makefile.am:
Auto merged
mysql-test/r/ctype_ucs.result:
Auto merged
mysql-test/r/fulltext.result:
Auto merged
mysql-test/r/heap.result:
Auto merged
mysql-test/r/heap_hash.result:
Auto merged
mysql-test/r/select.result:
Auto merged
mysql-test/t/select.test:
Auto merged
mysql-test/t/user_var.test:
Auto merged
ndb/src/mgmsrv/main.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/slave.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/structs.h:
Auto merged
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
fixed to that mgmt server actually uses the connectsring
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
provided better error printout
ndb/src/mgmsrv/main.cpp:
fixed to that mgmt server actually uses the connectsring
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
Makefile.am:
Auto merged
client/Makefile.am:
Auto merged
client/mysqldump.c:
Auto merged
configure.in:
Auto merged
include/my_global.h:
Auto merged
sql/log_event.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/sql_parse.cc:
SCCS 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
print some info event on api connects with wrong versions
BitKeeper/deleted/.del-Makefile.am~91c159ff4011609:
Delete: ndb/tools/restore/Makefile.am
ndb/src/common/transporter/TransporterRegistry.cpp:
let traffic through to api cluster manager as well
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
print some info event on api connects with wrong versions
ndb/include/ndbapi/NdbDictionary.hpp:
Auto merged
ndb/src/common/debugger/signaldata/SignalDataPrint.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
Auto merged
ndb/src/ndbapi/NdbOperationExec.cpp:
Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
ndb/config/win-lib.am:
removed TLS stuff (which I don't know what it is)
ndb/include/kernel/signaldata/UtilLock.hpp:
Made stuff public
ndb/include/ndb_global.h.in:
better defines for strcasecmp
ndb/src/common/transporter/Transporter.cpp:
Use NDB_INVALID_SOCKET
ndb/src/common/util/SocketClient.cpp:
Use NDB_INVALID_SOCKET
ndb/src/kernel/vm/Callback.hpp:
Move callback into SimulatedBlock as it for some mysterious reason
otherwise got sizeof()=0 on windows
ndb/src/kernel/vm/Configuration.cpp:
Removed extra (bug) semi-colon
ndb/src/kernel/vm/Mutex.cpp:
Move callback into SimulatedBlock as it for some mysterious reason
otherwise got sizeof()=0 on windows
ndb/src/kernel/vm/Mutex.hpp:
Move callback into SimulatedBlock as it for some mysterious reason
otherwise got sizeof()=0 on windows
ndb/src/kernel/vm/SectionReader.cpp:
Use correct struct-type
ndb/src/kernel/vm/SectionReader.hpp:
Use correct struct-type
ndb/src/kernel/vm/SimulatedBlock.cpp:
Move callback into SimulatedBlock as it for some mysterious reason
otherwise got sizeof()=0 on windows
ndb/src/kernel/vm/SimulatedBlock.hpp:
Move callback into SimulatedBlock as it for some mysterious reason
otherwise got sizeof()=0 on windows
ndb/src/mgmclient/Makefile.am:
Add mgm client to windoze
ndb/test/src/Makefile.am:
Fix lib
kernel includes needed by ndb_restore
changed link order
moved LocalConfig to mgmapi
Moved NdbConfig to Portlib
mgmapi to use LocalConfig for connectstring parsing instead of it's own
enable usage of "NULL" connectstring for default
new ndbmgmclient lib that can be used by e.g. mysqladmin later
LocalConfig no longer needed here, now in mgmapi
Send connectstring to mgmapi instead
added valid connectstring to be with only host without port i.e.
valid connectstring =host1,host2,host3
default port will be added
ndb/src/common/portlib/NdbConfig.c:
Rename: ndb/src/common/mgmcommon/NdbConfig.c -> ndb/src/common/portlib/NdbConfig.c
ndb/include/portlib/NdbConfig.h:
Rename: ndb/include/mgmcommon/NdbConfig.h -> ndb/include/portlib/NdbConfig.h
ndb/include/mgmapi/LocalConfig.hpp:
Rename: ndb/include/mgmcommon/LocalConfig.hpp -> ndb/include/mgmapi/LocalConfig.hpp
ndb/tools/restore/Makefile.am:
Rename: ndb/src/kernel/blocks/backup/restore/Makefile.am -> ndb/tools/restore/Makefile.am
ndb/tools/restore/consumer.cpp:
Rename: ndb/src/kernel/blocks/backup/restore/consumer.cpp -> ndb/tools/restore/consumer.cpp
ndb/tools/restore/consumer.hpp:
Rename: ndb/src/kernel/blocks/backup/restore/consumer.hpp -> ndb/tools/restore/consumer.hpp
ndb/tools/restore/consumer_printer.hpp:
Rename: ndb/src/kernel/blocks/backup/restore/consumer_printer.hpp -> ndb/tools/restore/consumer_printer.hpp
ndb/tools/restore/consumer_printer.cpp:
Rename: ndb/src/kernel/blocks/backup/restore/consumer_printer.cpp -> ndb/tools/restore/consumer_printer.cpp
ndb/tools/restore/consumer_restore.hpp:
Rename: ndb/src/kernel/blocks/backup/restore/consumer_restore.hpp -> ndb/tools/restore/consumer_restore.hpp
ndb/tools/restore/main.cpp:
Rename: ndb/src/kernel/blocks/backup/restore/main.cpp -> ndb/tools/restore/main.cpp
ndb/tools/restore/consumer_restorem.cpp:
Rename: ndb/src/kernel/blocks/backup/restore/consumer_restorem.cpp -> ndb/tools/restore/consumer_restorem.cpp
configure.in:
moved ndb_restore together with rest of the ndb tools
ndb/config/type_ndbapitools.mk.am:
kernel includes needed by ndb_restore
ndb/src/Makefile.am:
changed link order
ndb/src/common/mgmcommon/Makefile.am:
mived LocalConfig to mgmapi
ndb/src/common/portlib/Makefile.am:
Moved NdbConfig to Portlib
ndb/src/kernel/blocks/backup/Makefile.am:
moved restore together with rest of ndb tools
ndb/src/mgmapi/LocalConfig.cpp:
added valid connectstring to be with only host without port i.e.
valid connectstring =host1,host2,host3
default port will be added
ndb/src/mgmapi/Makefile.am:
LocalConfig part of the libmgmapi
ndb/src/mgmapi/mgmapi.cpp:
mgmapi to use LocalConfig for connectstring parsing instead of it's own
ndb/src/mgmclient/CommandInterpreter.cpp:
enable usage of "NULL" connectstring for default
ndb/src/mgmclient/Makefile.am:
new ndbmgmclient lib that can be used by e.g. mysqladmin later
ndb/src/mgmclient/main.cpp:
LocalConfig no longer needed here, now in mgmapi
Send connectstring to mgmapi instead
ndb/tools/Makefile.am:
add ndb_restore to make of tools
ndb/tools/restore/Restore.cpp:
moved include BackupFormat and NdbDictionaryImpl to Restore.hpp
ndb/tools/restore/Restore.hpp:
moved include BackupFormat and NdbDictionaryImpl to Restore.hpp
ndb/tools/restore/consumer_restore.cpp:
moved include BackupFormat and NdbDictionaryImpl to Restore.hpp
ndb/tools/waiter.cpp:
LocalConfig moved
BitKeeper/etc/ignore:
auto-union
configure.in:
Auto merged
include/my_global.h:
Auto merged
include/my_sys.h:
Auto merged
include/mysql.h:
Auto merged
include/mysqld_error.h:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/alter_table.result:
Auto merged
mysql-test/r/ndb_autodiscover.result:
Auto merged
mysql-test/r/null.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/t/alter_table.test:
Auto merged
mysql-test/t/null.test:
Auto merged
ndb/src/mgmsrv/main.cpp:
Auto merged
sql/field.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/handler.h:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/slave.h:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/share/czech/errmsg.txt:
Auto merged
sql/share/danish/errmsg.txt:
Auto merged
sql/share/dutch/errmsg.txt:
Auto merged
sql/share/english/errmsg.txt:
Auto merged
sql/share/estonian/errmsg.txt:
Auto merged
sql/share/french/errmsg.txt:
Auto merged
sql/share/german/errmsg.txt:
Auto merged
sql/share/greek/errmsg.txt:
Auto merged
sql/share/hungarian/errmsg.txt:
Auto merged
sql/share/italian/errmsg.txt:
Auto merged
sql/share/japanese/errmsg.txt:
Auto merged
sql/share/korean/errmsg.txt:
Auto merged
sql/share/norwegian-ny/errmsg.txt:
Auto merged
sql/share/norwegian/errmsg.txt:
Auto merged
sql/share/polish/errmsg.txt:
Auto merged
sql/share/portuguese/errmsg.txt:
Auto merged
sql/share/romanian/errmsg.txt:
Auto merged
sql/share/russian/errmsg.txt:
Auto merged
sql/share/serbian/errmsg.txt:
Auto merged
sql/share/slovak/errmsg.txt:
Auto merged
sql/share/spanish/errmsg.txt:
Auto merged
sql/share/swedish/errmsg.txt:
Auto merged
sql/share/ukrainian/errmsg.txt:
Auto merged
into mysql.com:/space/pekka/ndb/version/my50-cc
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
