Wait some for all nodes to get connected
ndb/tools/drop_index.cpp:
Wait some for all nodes to get connected
ndb/tools/drop_tab.cpp:
Wait some for all nodes to get connected
into mysql.com:/home/jonas/src/mysql-5.0-ndb
ndb/include/kernel/signaldata/CreateIndx.hpp:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
ndb/src/ndbapi/ndb_cluster_connection.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
into mysql.com:/home/jonas/src/mysql-5.0
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
ndb/src/ndbapi/ndb_cluster_connection.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
remove dict forwarding
add api retries on NotMaster
ndb/include/kernel/signaldata/AlterIndx.hpp:
Add NotMaster error code
ndb/include/kernel/signaldata/BuildIndx.hpp:
Add NotMaster error code
ndb/include/kernel/signaldata/CreateIndx.hpp:
Add NotMaster error code
ndb/include/kernel/signaldata/CreateTrig.hpp:
Add NotMaster error code
ndb/include/kernel/signaldata/DropIndx.hpp:
Add NotMaster error code
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Never forward requests,
instead REF to API who will retry towards correct node
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
1) Set error code for timeout
2) Handle NotMaster with retry in all DICT requests
ndb/src/ndbapi/ndb_cluster_connection.cpp:
Fix so that input values is in seconds and not 100ms's
sql/ha_ndbcluster.cc:
Wait 3 sec for all nodes to connect...
mysql-test/r/ndb_condition_pushdown.result:
fix binary LIKE binary in ndb api
mysql-test/t/ndb_condition_pushdown.test:
fix binary LIKE binary in ndb api
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
fix binary LIKE binary in ndb api
ndb/src/ndbapi/NdbOperationInt.cpp:
fix binary LIKE binary in ndb api
ndb/src/ndbapi/NdbScanFilter.cpp:
fix binary LIKE binary in ndb api
BitKeeper/etc/logging_ok:
auto-union
include/mysql_com.h:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
sql/handler.h:
Auto merged
sql/item.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/log.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
sql/ha_ndbcluster.cc:
Auto merged
sql/handler.h:
Auto merged
sql/item.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_select.cc:
Auto merged
BitKeeper/etc/logging_ok:
auto-union
mysql-test/mysql-test-run.sh:
Auto merged
ndb/src/kernel/vm/Emulator.cpp:
Auto merged
ndb/src/kernel/vm/Emulator.hpp:
Auto merged
sql/item.cc:
Auto merged
sql/log.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
ndb/src/kernel/main.cpp:
merge
make sure transporter connections are close early in shutdown
ndb/src/common/logger/LogHandler.cpp:
removed printout "- Repeated 1 times"
ndb/src/kernel/main.cpp:
make sure transporter connections are close early in shutdown
ndb/src/kernel/vm/Emulator.cpp:
make sure transporter connections are close early in shutdown
ndb/src/kernel/vm/Emulator.hpp:
make sure transporter connections are close early in shutdown
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
mysql-test/mysql-test-run.pl:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/log.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/item.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_select.cc:
Auto merged
(not to be merged as code has changed in 5.0)
ndb/src/mgmapi/LocalConfig.cpp:
Allow connecstring = "nodeid=X"
ndb/src/mgmsrv/MgmtSrvr.cpp:
remove incorrect asserts
into mysql.com:/home/jonas/src/mysql-5.0
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/triggers/post-commit:
Auto merged
sql/item.cc:
Auto merged
sql/log.cc:
Auto merged
sql/sql_parse.cc:
Auto merged