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.
mysql-test/r/ndb_index_ordered.result:
fix new decimal mysql vs. ndb
mysql-test/t/ndb_index_ordered.test:
fix new decimal mysql vs. ndb
ndb/include/kernel/signaldata/DictTabInfo.hpp:
fix new decimal mysql vs. ndb
ndb/include/ndb_constants.h:
fix new decimal mysql vs. ndb
ndb/include/ndbapi/NdbDictionary.hpp:
fix new decimal mysql vs. ndb
ndb/include/util/NdbSqlUtil.hpp:
fix new decimal mysql vs. ndb
ndb/src/common/util/NdbSqlUtil.cpp:
fix new decimal mysql vs. ndb
ndb/src/ndbapi/NdbDictionary.cpp:
fix new decimal mysql vs. ndb
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
fix new decimal mysql vs. ndb
ndb/src/ndbapi/NdbRecAttr.cpp:
fix new decimal mysql vs. ndb
ndb/test/include/NdbSchemaOp.hpp:
fix new decimal mysql vs. ndb
ndb/test/src/HugoCalculator.cpp:
fix new decimal mysql vs. ndb
ndb/tools/restore/consumer.cpp:
fix new decimal mysql vs. ndb
sql/ha_ndbcluster.cc:
fix new decimal mysql vs. ndb
changed to set NdbMgmHandle from IPPConfig, and use info from configuration, instead of mgm handle from config retrieval
ndb/src/ndbapi/Ndb.cpp:
added som debug printout
ndb/src/ndbapi/NdbTransaction.cpp:
added some debug printout
mysql-test/r/ndb_index_ordered.result:
Auto merged
mysql-test/t/ndb_index_ordered.test:
Auto merged
ndb/src/ndbapi/NdbDictionary.cpp:
Auto merged
ndb/src/ndbapi/NdbRecAttr.cpp:
Auto merged
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
sql/filesort.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/sql_select.cc:
Auto merged
mysql-test/r/ndb_index_ordered.result:
fix old decimal type mysql vs ndb (re-commit 3)
mysql-test/t/ndb_index_ordered.test:
fix old decimal type mysql vs ndb (re-commit 3)
ndb/include/kernel/signaldata/DictTabInfo.hpp:
fix old decimal type mysql vs ndb (re-commit 3)
ndb/include/ndbapi/NdbDictionary.hpp:
fix old decimal type mysql vs ndb (re-commit 3)
ndb/include/util/NdbSqlUtil.hpp:
fix old decimal type mysql vs ndb (re-commit 3)
ndb/src/common/util/NdbSqlUtil.cpp:
fix old decimal type mysql vs ndb (re-commit 3)
ndb/src/ndbapi/NdbDictionary.cpp:
fix old decimal type mysql vs ndb (re-commit 3)
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
fix old decimal type mysql vs ndb (re-commit 3)
ndb/src/ndbapi/NdbRecAttr.cpp:
fix old decimal type mysql vs ndb (re-commit 3)
ndb/test/include/NdbSchemaOp.hpp:
fix old decimal type mysql vs ndb (re-commit 3)
ndb/tools/restore/consumer.cpp:
fix old decimal type mysql vs ndb (re-commit 3)
sql/ha_ndbcluster.cc:
fix old decimal type mysql vs ndb (re-commit 3)
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0-ndb
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/triggers/post-commit:
Auto merged
ndb/test/run-test/Makefile.am:
Auto merged
sql/item.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Re-introduce ability to have
[tcp default]PortNumber= 4242
in config.ini to NOT use dynamic ports.
Dynamic port numbers are the default though.
We still use the mgm port for transporter connections to a mgm server though.
This is (slightly) different than before, but since you have to be able to connect
to the mgm server anyway, this does not require extra firewall rules or anything.
ndb/src/mgmsrv/ConfigInfo.cpp:
Restore (optional) old behaviour of having a base port number and incrementing.
into mysql.com:/home/my/mysql-5.0
BitKeeper/triggers/post-commit:
Auto merged
mysql-test/r/distinct.result:
Auto merged
mysql-test/r/select.result:
Auto merged
sql/table.cc:
Auto merged
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/triggers/post-commit:
Auto merged
innobase/row/row0mysql.c:
Auto merged
myisam/ft_boolean_search.c:
Auto merged
mysql-test/r/ctype_ucs.result:
Auto merged
mysql-test/r/distinct.result:
Auto merged
mysql-test/r/fulltext.result:
Auto merged
mysql-test/r/select.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/r/union.result:
Auto merged
mysql-test/t/ctype_ucs.test:
Auto merged
mysql-test/t/subselect.test:
Auto merged
mysql-test/t/union.test:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_list.h:
Auto merged
sql/examples/ha_archive.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_string.h:
Auto merged
vio/viosocket.c:
Auto merged
scripts/mysql_create_system_tables.sh:
simple merge
sql/field.cc:
simple merge
sql/item.h:
simple merge
sql/sql_lex.h:
simple merge
sql/sql_yacc.yy:
Merge
(join_table_list was not comptely merged. Need to run test to know how things works...)
sql/table.cc:
Keep code from 5.0, except delted one not needed line
strings/ctype-ucs2.c:
Auto merge
added debug printouts
changed mem allocation handling in event api
split single and parallell event operation testing
ndb/src/kernel/blocks/suma/Suma.cpp:
added info to dump state 8004
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
added debug printouts
ndb/src/ndbapi/NdbEventOperationImpl.cpp:
changed mem allocation handling in event api
ndb/test/ndbapi/test_event.cpp:
split single and parallell event operation testing
- don't wait an extra 400ms before retrying a transporter connect if the port is dynamic
ndb/src/common/transporter/TransporterRegistry.cpp:
Don't wait extra time before retrying
Reconnect to mgm server in connect_clients thread if m_mgm_handle is disconnected.
ndb/include/mgmapi/mgmapi.h:
Add prototype for ndb_mgm_is_connected
ndb/src/common/transporter/TransporterRegistry.cpp:
start_clients_thread:
- don't get port if we don't have to
- Reconnect to mgm server if m_mgm_handle is disconnected
ndb/src/mgmapi/mgmapi.cpp:
add ndb_mgm_is_connected
