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
ndb/src/mgmapi/LocalConfig.cpp:
added options to give nodeid and mgmd host directly as switches (without using the connectstring)
reset nodeid on init
allow only nodeid to be specified in the connectstring
allow mgmd-host in connectstring
ndb/src/mgmapi/mgmapi.cpp:
just some extra debug printouts
ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
TUP interpreter: use byte length in attr OP const
ndb/src/ndbapi/NdbOperationInt.cpp:
TUP interpreter: use byte length in attr OP const
ndb/src/common/transporter/TransporterRegistry.cpp:
make sure we handle a failure case in connect_mgmd correctly
ndb/src/mgmapi/mgmapi.cpp:
return NDB_INVALID_SOCKET at failure
ndb/include/ndbapi/NdbScanFilter.hpp:
TUP scan filter support for LIKE/NOT_LIKE
ndb/include/util/NdbSqlUtil.hpp:
TUP scan filter support for LIKE/NOT_LIKE
ndb/src/common/util/NdbSqlUtil.cpp:
TUP scan filter support for LIKE/NOT_LIKE
ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
TUP scan filter support for LIKE/NOT_LIKE
ndb/src/ndbapi/NdbScanFilter.cpp:
TUP scan filter support for LIKE/NOT_LIKE
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-wl2278
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
ndb/include/mgmapi/mgmapi.h:
Auto merged
ndb/src/kernel/vm/Configuration.cpp:
Auto merged
ndb/src/mgmapi/mgmapi.cpp:
Auto merged
ndb/src/mgmclient/CommandInterpreter.cpp:
Auto merged
sql/sql_parse.cc:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
ndb/include/mgmcommon/ConfigRetriever.hpp:
Auto merged
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
Auto merged
ndb/src/kernel/vm/Configuration.cpp:
Auto merged
ndb/src/mgmapi/mgmapi.cpp:
Auto merged
ndb/src/mgmclient/CommandInterpreter.cpp:
Auto merged
ndb/include/mgmapi/mgmapi.h:
merge
ndb/src/mgmsrv/ConfigInfo.cpp:
fixPortNumber:
- Remove unneeded is_mgm_connection variable
- restore functionality of specifying a port number per connection.
