BitKeeper/etc/logging_ok:
auto-union
client/mysql.cc:
Auto merged
client/mysqldump.c:
Auto merged
libmysql/libmysql.c:
Auto merged
myisam/mi_open.c:
Auto merged
mysql-test/r/order_by.result:
Auto merged
sql/filesort.cc:
Auto merged
sql/sql_select.cc:
Auto merged
mysql-test/t/order_by.test:
Merge
sql/sql_lex.cc:
Merge
sql/sql_yacc.yy:
Use local copy
client/mysql.cc:
Auto merged
client/mysqldump.c:
Auto merged
myisam/mi_open.c:
Auto merged
mysql-test/r/ctype_ucs.result:
Auto merged
mysql-test/t/user_var.test:
Auto merged
sql-common/client.c:
Auto merged
sql/log_event.cc:
Auto merged
mysql-test/r/user_var.result:
SCCS merged
ndb/docs/Makefile.am:
Auto merged
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
ndb/include/ndbapi/NdbDictionary.hpp:
Auto merged
ndb/src/ndbapi/NdbDictionary.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
sql/mysqld.cc:
Auto merged
added number_of_replicas printout in show table status
mysql-test/r/ndb_alter_table.result:
added number_of_replicas to show table status printout
mysql-test/r/ndb_autodiscover.result:
added number_of_replicas to show table status printout
ndb/include/ndbapi/NdbDictionary.hpp:
added get method for replica count
ndb/include/ndbapi/ndb_cluster_connection.hpp:
added get method of node id
ndb/src/ndbapi/NdbDictionary.cpp:
added get method for replica count
ndb/src/ndbapi/ndb_cluster_connection.cpp:
added get method of node id
ndb/include/ndbapi/NdbDictionary.hpp:
NdbDictionaryColumn::getSizeInBytes
ndb/include/ndbapi/NdbOperation.hpp:
NdbOperation::getTable
ndb/include/ndbapi/NdbTransaction.hpp:
Make getConnectionNodeId public (for test programs)
ndb/include/util/Base64.hpp:
base64(void*)
ndb/src/common/util/Base64.cpp:
base64(void*)
ndb/src/kernel/blocks/ERROR_codes.txt:
New error code for REF'ing non-local TCKEYREQ
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Easy clearing of ERROR_INSERT
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
New error code for REF'ing non-local TCKEYREQ
ndb/src/ndbapi/NdbDictionary.cpp:
NdbDictionaryColumn::getSizeInBytes
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
If m_noIfDistKyes == 0, then each PK is dist key
ndb/src/ndbapi/NdbOperation.cpp:
NdbOperation::getTable
ndb/src/ndbapi/NdbOperationSearch.cpp:
remove d-key handling for pk ops
ndb/test/include/HugoCalculator.hpp:
remove unimpletemented methods
ndb/test/include/HugoOperations.hpp:
1) HugoOperation::setTransaction
2) Type independant value handling
3) Some more util methods
ndb/test/ndbapi/testPartitioning.cpp:
new testcase for validating startTransation with hint
ndb/test/run-test/atrt-mysql-test-run:
fix checks of return values
ndb/test/src/HugoCalculator.cpp:
Better generation of values
-- depends on fact that srand(K), rand() == srand(K), rand()
Generate string with base64
ndb/test/src/HugoOperations.cpp:
1) HugoOperation::setTransaction
2) Type independant value handling
3) Some more util methods
(Suggested by Tomas Ulin as part of review for WL2278)
ndb/include/transporter/TransporterRegistry.hpp:
Differentiate signed port numbers from unsigned ones
ndb/src/common/mgmcommon/IPCConfig.cpp:
Explain the sign of server_port
ndb/src/common/transporter/TransporterRegistry.cpp:
Use s_port to indicate a signed port number.
ndb/src/kernel/main.cpp:
use m_s_service_port to indicate signed port number
ndb/src/mgmsrv/MgmtSrvr.cpp:
differentiate between signed and unsigned port numbers
ndb/src/ndbapi/ndb_cluster_connection.cpp:
use m_s_service_port to indicate signed port number
Added pseudo column fragment memory
changed ndb_get_table_statistics to take struct
and read row_size and fragment_memory
ndb/include/kernel/AttributeHeader.hpp:
Added pseudo column fragment memory
ndb/include/ndbapi/NdbDictionary.hpp:
Added pseudo column fragment memory
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
Added pseudo column fragment memory
ndb/src/ndbapi/NdbDictionary.cpp:
Added pseudo column fragment memory
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Added pseudo column fragment memory
sql/ha_ndbcluster.cc:
changed ndb_get_table_statistics to take struct
and read row_size and fragment_memory
sql/ha_ndbcluster.h:
partially implemented update_table_comment
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
search for subscriber should be done on nodeid basis and not reference, only one subscriber per event per nodeid allowed
not necessarily the same starts and stops...
+error corrected in ref signal
added print of error codes + more correct error handling of event errors
+ added goto instead of erroneous break to fix bug#7627
ndb/include/kernel/signaldata/SignalData.hpp:
added som signal printout functions
ndb/src/common/debugger/signaldata/SignalDataPrint.cpp:
added som signal printout functions
ndb/src/common/debugger/signaldata/SignalNames.cpp:
added som signal printout functions
ndb/src/common/debugger/signaldata/SumaImpl.cpp:
added som signal printout functions
ndb/src/kernel/blocks/suma/Suma.cpp:
search for subscriber should be done on nodeid basis and not reference, only one subscriber per event per nodeid allowed
not necessarily the same starts and stops...
+error corrected in ref signal
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
indentation
event error handling
debug printouts
ndb/src/ndbapi/NdbEventOperationImpl.cpp:
debug printouts
+ added goto instead of erroneous break to fix bug#7627
ndb/test/src/HugoTransactions.cpp:
added print of error codes + more correct error handling of event errors
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
Pre book fragments to keep count how many ops need to be continued by
api
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Pre book fragments to keep count how many ops need to be continued by
api
Fixes problem with parallelism < fragcount && committed read
ndb/test/ndbapi/testScan.cpp:
new testcase for scan parallelism
ndb/test/run-test/daily-basic-tests.txt:
Run new testcase
ndb/test/src/HugoTransactions.cpp:
Use parallelism parameter
into mysql.com:/home/stewart/Documents/MySQL/5.0/ndb-dynamic-ports-impl4
ndb/src/common/transporter/TransporterRegistry.cpp:
Auto merged
ndb/src/mgmapi/mgmapi.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
ndb/src/mgmsrv/Services.cpp:
Auto merged
When a node restarts it starts over again with fetching the configuration
- It is not sure that it can use the "old dynamically allocated port number" again.
- It should however try to reuse the old one, if not possible it should
allocate a new one. One has to be able to distinguish between portnumbers
specified originally in the config, and ones that has been dynamically added
(the latter may be changed if "busy", but the first cannot be changed).
We use negative portnumbers for ports that are ok to change.
ndb/include/mgmapi/mgmapi_debug.h:
change prototype for:
ndb_mgm_set_connection_int_parameter
ndb_mgm_get_connection_int_parameter
Accept/set an int instead of an unsigned
ndb/include/transporter/TransporterRegistry.hpp:
Use an int (signed) to represent a port number.
Zero means dynamic (but unassigned)
>0 means static (defined in configuration)
<0 means dynamic (and should be converted to positive before use)
ndb/src/common/mgmcommon/IPCConfig.cpp:
Set up the Transporter with a port number of the correct sign.
ndb/src/common/transporter/TransporterRegistry.cpp:
start_clients_thread:
- handle negative port numbers
add_transporter_interface:
- accept signed integer as port number
start_service:
- If port is dynamic (<0), try to bind to it.
if that fails (e.g. some other process has taken that port),
then get a new dynamic port number.
ndb/src/mgmapi/mgmapi.cpp:
Use a signed integer for value in:
ndb_mgm_set_connection_int_parameter
ndb_mgm_get_connection_int_parameter
Cast to a Uint32 for storage/retrieval to/from Properties
ndb/src/mgmsrv/MgmtSrvr.cpp:
getConnectionDbParameter
- return value as integer (signed)
- cast as Uint32 for iter.get
ndb/src/mgmsrv/MgmtSrvr.hpp:
Update prototype of getConnectionDbParameter
int value (not unsigned anymore)
ndb/src/mgmsrv/Services.cpp:
MgmApiSession::getConnectionParameter
- value is now signed
into mysql.com:/home/stewart/Documents/MySQL/5.0/ndb-dynamic-ports-impl3
ndb/src/common/transporter/TransporterRegistry.cpp:
Auto merged
ndb/src/mgmapi/mgmapi.cpp:
Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
ndb/src/mgmsrv/main.cpp:
Auto merged
VC++Files/libmysqld/libmysqld.dsp:
Auto merged
client/mysql.cc:
Auto merged
include/my_sys.h:
Auto merged
libmysqld/lib_sql.cc:
Auto merged
mysql-test/r/ctype_utf8.result:
Auto merged
ndb/src/kernel/blocks/backup/Backup.cpp:
Auto merged
ndb/src/kernel/blocks/suma/Suma.cpp:
Auto merged
ndb/src/mgmsrv/InitConfigFileParser.cpp:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/strfunc.cc:
Auto merged
VC++Files/sql/mysqld.dsp:
Libraries changed
mysys/default.c:
get_defaults_files implementation added
sql/sql_base.cc:
merging
sql/sql_show.cc:
merging
