mysql-test/r/ndb_alter_table.result:
wl-1442 new varchar
mysql-test/r/ndb_bitfield.result:
wl-1442 new varchar
mysql-test/r/ndb_charset.result:
wl-1442 new varchar
mysql-test/t/ndb_charset.test:
wl-1442 new varchar
ndb/include/kernel/signaldata/DictTabInfo.hpp:
wl-1442 new varchar
ndb/include/ndb_constants.h:
wl-1442 new varchar
ndb/include/ndbapi/NdbDictionary.hpp:
wl-1442 new varchar
ndb/include/util/NdbSqlUtil.hpp:
wl-1442 new varchar
ndb/src/common/util/NdbSqlUtil.cpp:
wl-1442 new varchar
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
wl-1442 new varchar
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
wl-1442 new varchar
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
wl-1442 new varchar
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
wl-1442 new varchar
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
wl-1442 new varchar
ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
wl-1442 new varchar
ndb/src/ndbapi/NdbDictionary.cpp:
wl-1442 new varchar
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
wl-1442 new varchar
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
wl-1442 new varchar
ndb/src/ndbapi/NdbOperationDefine.cpp:
wl-1442 new varchar
ndb/src/ndbapi/NdbOperationSearch.cpp:
wl-1442 new varchar
ndb/src/ndbapi/NdbRecAttr.cpp:
wl-1442 new varchar
ndb/src/ndbapi/NdbTransaction.cpp:
wl-1442 new varchar
ndb/test/ndbapi/testOIBasic.cpp:
wl-1442 new varchar
sql/ha_ndbcluster.cc:
wl-1442 new varchar
added my_pthread_init to get dbug print correct in Hugo
added define for event error code
ndb/examples/ndbapi_event_example/ndbapi_event.cpp:
updated event example to make use of new NdbError member in NdbEventOperation
+ use define to check error code
ndb/include/kernel/signaldata/CreateEvnt.hpp:
updated create event signal to use define
ndb/include/ndbapi/NdbEventOperation.hpp:
added NdbError member to NdbEventOperation
ndb/include/ndbapi/ndberror.h:
added define for event error code
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
changed name of error code
ndb/src/ndbapi/NdbEventOperation.cpp:
added NdbError
ndb/src/ndbapi/NdbEventOperationImpl.cpp:
added debug printout
added some error handling
ndb/src/ndbapi/NdbEventOperationImpl.hpp:
added NdbError
ndb/src/ndbapi/Ndberr.cpp:
added NdbError for NdbEventOperationImpl
ndb/src/ndbapi/ndberror.c:
changed some error codes
ndb/test/ndbapi/test_event.cpp:
added testcase for BUG#7627
ndb/test/src/HugoTransactions.cpp:
added printout in event
ndb/test/src/NDBT_Test.cpp:
added my_pthread_init to get dbug print correct
configure.in:
Auto merged
ndb/include/ndbapi/NdbApi.hpp:
Auto merged
ndb/include/ndbapi/NdbReceiver.hpp:
Auto merged
ndb/include/transporter/TransporterRegistry.hpp:
Auto merged
ndb/src/common/logger/Logger.cpp:
Auto merged
ndb/src/common/mgmcommon/IPCConfig.cpp:
Auto merged
ndb/src/common/transporter/Transporter.hpp:
Auto merged
ndb/src/kernel/main.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
ndb/src/mgmsrv/main.cpp:
Auto merged
ndb/src/ndbapi/Ndb.cpp:
Auto merged
ndb/src/ndbapi/NdbBlob.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
ndb/src/ndbapi/NdbTransaction.cpp:
Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
Auto merged
ndb/test/ndbapi/testBlobs.cpp:
Auto merged
ndb/test/ndbapi/flexAsynch.cpp:
new constructor
ndb/test/ndbapi/flexHammer.cpp:
new constructor
ndb/test/ndbapi/flexTT.cpp:
new constructor
ndb/test/ndbapi/slow_select.cpp:
new constructor
ndb/test/ndbapi/testDeadlock.cpp:
new constructor
ndb/test/ndbapi/testLcp.cpp:
new constructor
configure.in:
Auto merged
client/mysqldump.c:
Auto merged
innobase/buf/buf0rea.c:
Auto merged
innobase/dict/dict0load.c:
Auto merged
innobase/fil/fil0fil.c:
Auto merged
innobase/include/fil0fil.h:
Auto merged
innobase/include/row0mysql.h:
Auto merged
innobase/include/trx0trx.h:
Auto merged
innobase/os/os0file.c:
Auto merged
innobase/row/row0ins.c:
Auto merged
innobase/row/row0mysql.c:
Auto merged
innobase/row/row0sel.c:
Auto merged
innobase/srv/srv0start.c:
Auto merged
innobase/trx/trx0trx.c:
Auto merged
libmysqld/lib_sql.cc:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/alter_table.result:
Auto merged
mysql-test/r/ctype_ucs.result:
Auto merged
mysql-test/r/func_str.result:
Auto merged
mysql-test/r/grant.result:
Auto merged
mysql-test/r/grant_cache.result:
Auto merged
mysql-test/r/merge.result:
Auto merged
mysql-test/r/ndb_blob.result:
Auto merged
mysql-test/r/ps_1general.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/r/timezone2.result:
Auto merged
mysql-test/t/ctype_ucs.test:
Auto merged
mysql-test/t/grant.test:
Auto merged
mysql-test/t/merge.test:
Auto merged
mysql-test/t/multi_update.test:
Auto merged
mysql-test/t/mysqldump.test:
Auto merged
mysql-test/t/subselect.test:
Auto merged
ndb/src/ndbapi/NdbBlob.cpp:
Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
ndb/src/ndbapi/NdbOperationDefine.cpp:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_myisammrg.cc:
Auto merged
sql/ha_myisammrg.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql-common/client.c:
Auto merged
sql/sql_table.cc:
Auto merged
sql/strfunc.cc:
Auto merged
sql/unireg.cc:
Auto merged
vio/vio.c:
Auto merged
vio/viosocket.c:
Auto merged
BitKeeper/etc/logging_ok:
auto-union
ndb/docs/wl2077.txt:
Auto merged
ndb/include/Makefile.am:
Auto merged
ndb/include/ndbapi/NdbTransaction.hpp:
Auto merged
ndb/src/common/debugger/EventLogger.cpp:
Auto merged
ndb/src/common/debugger/signaldata/DictTabInfo.cpp:
Auto merged
ndb/src/common/logger/Logger.cpp:
Auto merged
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
Auto merged
ndb/src/common/util/Makefile.am:
Auto merged
ndb/src/kernel/blocks/dbacc/DbaccInit.cpp:
Auto merged
ndb/src/kernel/blocks/dbacc/Makefile.am:
Auto merged
ndb/src/kernel/main.cpp:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
Auto merged
ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp:
Auto merged
ndb/src/kernel/vm/Configuration.cpp:
Auto merged
ndb/src/kernel/vm/Configuration.hpp:
Auto merged
ndb/src/mgmapi/mgmapi.cpp:
Auto merged
ndb/src/mgmsrv/CommandInterpreter.cpp:
Auto merged
ndb/src/mgmsrv/InitConfigFileParser.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
Auto merged
ndb/src/mgmsrv/Services.cpp:
Auto merged
ndb/src/mgmsrv/Services.hpp:
Auto merged
ndb/src/mgmsrv/main.cpp:
Auto merged
ndb/src/ndbapi/NdbBlob.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionary.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
Auto merged
ndb/src/ndbapi/NdbOperationExec.cpp:
Auto merged
ndb/src/ndbapi/NdbReceiver.cpp:
Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
ndb/src/ndbapi/NdbTransaction.cpp:
Auto merged
ndb/src/ndbapi/Ndbif.cpp:
Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
Auto merged
ndb/src/ndbapi/Ndblist.cpp:
Auto merged
ndb/src/ndbapi/TransporterFacade.cpp:
Auto merged
ndb/src/ndbapi/TransporterFacade.hpp:
Auto merged
ndb/src/ndbapi/ndberror.c:
Auto merged
ndb/test/ndbapi/Makefile.am:
Auto merged
ndb/test/ndbapi/testDict.cpp:
Auto merged
ndb/test/ndbapi/testNdbApi.cpp:
Auto merged
ndb/test/src/NdbRestarter.cpp:
Auto merged
ndb/test/tools/Makefile.am:
Auto merged
ndb/tools/Makefile.am:
Auto merged
ndb/tools/delete_all.cpp:
Auto merged
ndb/tools/desc.cpp:
Auto merged
ndb/tools/select_all.cpp:
Auto merged
ndb/tools/select_count.cpp:
Auto merged
scripts/make_win_src_distribution.sh:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
into mysql.com:/home/jonas/src/mysql-5.0
BitKeeper/etc/logging_ok:
auto-union
ndb/include/ndbapi/NdbDictionary.hpp:
Auto merged
ndb/src/common/util/Makefile.am:
Auto merged
ndb/src/kernel/blocks/backup/Backup.cpp:
Auto merged
ndb/src/kernel/blocks/backup/Backup.hpp:
Auto merged
ndb/src/kernel/blocks/backup/BackupInit.cpp:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionary.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
ndb/src/ndbapi/TransporterFacade.cpp:
Auto merged
ndb/src/ndbapi/TransporterFacade.hpp:
Auto merged
ndb/src/ndbapi/ndberror.c:
Auto merged
ndb/test/ndbapi/Makefile.am:
Auto merged
ndb/test/tools/Makefile.am:
Auto merged
ndb/tools/restore/restore_main.cpp:
Auto merged
ndb/test/ndbapi/testBitfield.cpp:
more removal of old constructor
ndb/test/ndbapi/testDataBuffers.cpp:
more removal of old constructor
ndb/test/ndbapi/testNdbApi.cpp:
more removal of old constructor
ndb/test/ndbapi/testReadPerf.cpp:
more removal of old constructor
ndb/test/ndbapi/testScanPerf.cpp:
more removal of old constructor
ndb/test/include/NDBT_Test.hpp:
Update to use new Ndb constructor
ndb/test/ndbapi/bank/Bank.cpp:
Update to use new Ndb constructor
ndb/test/ndbapi/bank/Bank.hpp:
Update to use new Ndb constructor
ndb/test/ndbapi/bank/bankCreator.cpp:
Update to use new Ndb constructor
ndb/test/ndbapi/bank/bankMakeGL.cpp:
Update to use new Ndb constructor
ndb/test/ndbapi/bank/bankSumAccounts.cpp:
Update to use new Ndb constructor
ndb/test/ndbapi/bank/bankTimer.cpp:
Update to use new Ndb constructor
ndb/test/ndbapi/bank/bankTransactionMaker.cpp:
Update to use new Ndb constructor
ndb/test/ndbapi/bank/bankValidateAllGLs.cpp:
Update to use new Ndb constructor
ndb/test/ndbapi/bank/testBank.cpp:
Update to use new Ndb constructor
ndb/test/ndbapi/create_all_tabs.cpp:
Update to use new Ndb constructor
ndb/test/ndbapi/create_tab.cpp:
Update to use new Ndb constructor
ndb/test/ndbapi/drop_all_tabs.cpp:
Update to use new Ndb constructor
ndb/test/ndbapi/flexBench.cpp:
Update to use new Ndb constructor
ndb/test/src/NDBT_Test.cpp:
Update to use new Ndb constructor
ndb/test/tools/copy_tab.cpp:
Update to use new Ndb constructor
ndb/test/tools/create_index.cpp:
Update to use new Ndb constructor
ndb/test/tools/hugoFill.cpp:
Update to use new Ndb constructor
ndb/test/tools/hugoLoad.cpp:
Update to use new Ndb constructor
ndb/test/tools/hugoLockRecords.cpp:
Update to use new Ndb constructor
ndb/test/tools/hugoPkDelete.cpp:
Update to use new Ndb constructor
ndb/test/tools/hugoPkRead.cpp:
Update to use new Ndb constructor
ndb/test/tools/hugoPkReadRecord.cpp:
Update to use new Ndb constructor
ndb/test/tools/hugoPkUpdate.cpp:
Update to use new Ndb constructor
ndb/test/tools/hugoScanRead.cpp:
Update to use new Ndb constructor
ndb/test/tools/hugoScanUpdate.cpp:
Update to use new Ndb constructor
ndb/test/tools/verify_index.cpp:
Update to use new Ndb constructor
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
Build-tools/Do-compile:
Auto merged
VC++Files/sql/mysqld.dsp:
Auto merged
client/Makefile.am:
Auto merged
client/mysql.cc:
Auto merged
BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
Auto merged
client/mysqltest.c:
Auto merged
include/my_base.h:
Auto merged
innobase/dict/dict0dict.c:
Auto merged
innobase/dict/dict0load.c:
Auto merged
innobase/include/dict0dict.h:
Auto merged
innobase/include/row0mysql.h:
Auto merged
innobase/os/os0file.c:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
libmysql/libmysql.c:
Auto merged
myisam/mi_check.c:
Auto merged
myisam/mi_rnext_same.c:
Auto merged
myisam/mi_write.c:
Auto merged
myisam/sort.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/ctype_ucs.result:
Auto merged
mysql-test/r/ctype_ujis.result:
Auto merged
mysql-test/r/gis-rtree.result:
Auto merged
mysql-test/r/group_by.result:
Auto merged
mysql-test/r/merge.result:
Auto merged
mysql-test/r/metadata.result:
Auto merged
mysql-test/r/ndb_alter_table.result:
Auto merged
mysql-test/r/ps_1general.result:
Auto merged
mysql-test/r/insert_update.result:
Auto merged
mysql-test/r/timezone2.result:
Auto merged
mysql-test/r/type_enum.result:
Auto merged
mysql-test/r/variables.result:
Auto merged
mysql-test/t/ctype_ucs.test:
Auto merged
mysql-test/t/merge.test:
Auto merged
mysql-test/t/ps_1general.test:
Auto merged
mysql-test/t/subselect.test:
Auto merged
mysql-test/t/system_mysql_db_fix.test:
Auto merged
mysql-test/t/variables.test:
Auto merged
ndb/include/ndbapi/NdbConnection.hpp:
Auto merged
ndb/include/ndbapi/NdbDictionary.hpp:
Auto merged
ndb/src/common/util/version.c:
Auto merged
ndb/src/kernel/blocks/dbacc/DbaccInit.cpp:
Auto merged
ndb/src/kernel/blocks/dbacc/Makefile.am:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
Auto merged
ndb/src/ndbapi/NdbBlob.cpp:
Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionary.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.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/test/ndbapi/Makefile.am:
Auto merged
scripts/make_win_src_distribution.sh:
Auto merged
scripts/mysql_install_db.sh:
Auto merged
sql/field.cc:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/handler.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_create.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_geofunc.cc:
Auto merged
sql/item_row.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_strfunc.h:
Auto merged
sql/item_sum.cc:
Auto merged
sql/item_sum.h:
Auto merged
sql/log.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/net_serv.cc:
Auto merged
sql/password.c:
Auto merged
sql/protocol.cc:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_derived.cc:
Auto merged
sql/sql_do.cc:
Auto merged
sql/sql_handler.cc:
Auto merged
sql/sql_help.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_union.cc:
Auto merged
sql/examples/ha_archive.cc:
Auto merged
sql/strfunc.cc:
Auto merged
sql/table.cc:
Auto merged
sql/table.h:
Auto merged
sql/tztime.h:
Auto merged
sql/udf_example.cc:
Auto merged
sql/unireg.cc:
Auto merged
Makefile.am:
Simple merge
client/mysqldump.c:
Simple merge
configure.in:
Simple merge
libmysqld/lib_sql.cc:
Automatic merge
mysql-test/r/func_str.result:
Automatic merge
mysql-test/r/grant.result:
simple merge
mysql-test/r/multi_update.result:
automatc merge
mysql-test/r/ps.result:
automatic merge
mysql-test/r/ps_2myisam.result:
Automatic merge
mysql-test/r/ps_3innodb.result:
Automatic merge
mysql-test/r/ps_4heap.result:
Automatic merge
mysql-test/r/ps_5merge.result:
Automatic merge
mysql-test/r/ps_6bdb.result:
Automatic merge
mysql-test/r/ps_7ndb.result:
Automatic merge
mysql-test/r/show_check.result:
Automatic merge
mysql-test/r/subselect.result:
Automatic merge
mysql-test/t/grant.test:
Automatic merge
mysql-test/t/multi_update.test:
Automatic merge
mysql-test/t/ps.test:
Automatic merge
mysql-test/t/show_check.test:
Automatic merge
ndb/docs/wl2077.txt:
merge
ndb/src/mgmsrv/main.cpp:
merge
scripts/mysql_fix_privilege_tables.sh:
merge
sql/item.cc:
Merge (difficult)
sql/item.h:
simple merge
sql/item_cmpfunc.h:
Automatic merge
sql/item_subselect.cc:
Simple merge
sql/item_subselect.h:
Automatic merge
sql/mysql_priv.h:
Simple merge
sql/slave.h:
Automatic merge
sql/sql_base.cc:
Removed code that was backported to 4.1
sql/sql_class.h:
Merge (some code moved to sql_insert.cc)
sql/sql_db.cc:
simple merge
sql/sql_insert.cc:
Merge (difficult as logic had changed both in 4.1 and 5.0)
Some coded moved here from sql_class.h
sql/sql_parse.cc:
Merge (difficult)
sql/sql_prepare.cc:
Simple merge
sql/sql_select.cc:
Automatic merge
sql/sql_table.cc:
Simple merge
sql/sql_update.cc:
Difficult merge because of different logic for multi-updates
sql/sql_yacc.yy:
Simple merge
tests/client_test.c:
Simple merge
added missing copyright text
moved ndb_init things to separate header file
removed ndb_global include
documented cluster connection class
moved internal constants to NdbImpl.hpp class
changed wait_until_ready behaviour somewhat
ndb/config/type_ndbapitest.mk.am:
corrected -I flag
ndb/include/Makefile.am:
added ndb_init.h to distribution
ndb/include/ndb_global.h.in:
added copyright text
moved ndb_init things to separate header file
ndb/include/ndbapi/NdbBlob.hpp:
moved error codes and internal constants to NdbBlobImpl.hpp
ndb/include/ndbapi/NdbReceiver.hpp:
removed ndb_global include
ndb/include/ndbapi/ndb_cluster_connection.hpp:
documented cluster connection class
changed wait_until_ready behaviour somewhat
ndb/src/ndbapi/Ndb.cpp:
documented cluster connection class
changed wait_until_ready behaviour somewhat
ndb/src/ndbapi/NdbBlob.cpp:
moved internal constants to NdbImpl.hpp class
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
moved internal constants to NdbImpl.hpp class
ndb/src/ndbapi/NdbOperationInt.cpp:
changed includes
ndb/src/ndbapi/ndb_cluster_connection.cpp:
changed wait_until_ready behaviour somewhat
ndb/test/ndbapi/testBlobs.cpp:
use impl class to get constants
ndb/test/ndbapi/testIndex.cpp:
Use stop and wait to capture error during restart
ndb/test/src/UtilTransactions.cpp:
Add extra check for readRowFromIndex failure due to loosing of locks
in scan
ndb/test/ndbapi/testOIBasic.cpp:
test ordering, add hash indexes, fix result verification
mysql-test/ndb/ndb_range_bounds.pl:
minor
mysql-test/r/ndb_index_ordered.result:
minor
mysql-test/t/ndb_index_ordered.test:
minor
ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
Fix handling reading of more that MAX_MESSAGE_SIZE
ndb/src/ndbapi/Ndbif.cpp:
Set theReturnStatus if failing before sending
ndb/test/ndbapi/testTimeout.cpp:
remove invalid tests
ndb/test/run-test/daily-basic-tests.txt:
remove invalid tests
moved NdbWaiter, m_ndb_cluster_connection, to impl class
moved node selection things to cluster connection
moved all private things to impl class
added opts for shared memory and node selection
changed opts handling somewhat; introduced enum for options and common handling of option variables
added checks for transporter support
automatic addition of shared mem transporters
moved wait_until_ready code to cluster connection
added control of usage of new node selection method
ndb/include/mgmapi/mgmapi_config_parameters.h:
added config parameter Group on connection
ndb/include/ndbapi/Ndb.hpp:
moved NdbWaiter, m_ndb_cluster_connection, to impl class
moved node selection things to cluster connection
ndb/include/ndbapi/ndb_cluster_connection.hpp:
moved all private things to impl class
ndb/include/util/ndb_opts.h:
added opts for shared memory and node selection
ndb/src/kernel/vm/Configuration.cpp:
changed opts handling somewhat; introduced enum for options and common handling of option variables
ndb/src/mgmclient/main.cpp:
changed opts handling somewhat; introduced enum for options and common handling of option variables
ndb/src/mgmsrv/ConfigInfo.cpp:
added checks for transporter support
automatic addition of shared mem transporters
ndb/src/mgmsrv/MgmtSrvr.cpp:
in alloc node id first choose connection with specified hostname
ndb/src/mgmsrv/main.cpp:
changed opts handling somewhat; introduced enum for options and common handling of option variables
ndb/src/ndbapi/DictCache.hpp:
added include file
ndb/src/ndbapi/Ndb.cpp:
enabled using new node selection method
moved wait_until_ready code to cluster connection
moved node selection (hint) to cluster connection
removed start transaction dgroup
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
removed and added inclusde files
ndb/src/ndbapi/NdbImpl.hpp:
moved things from Ndb into Impl class
moved waiter things to new file NdbWaiter.hpp
ndb/src/ndbapi/NdbScanOperation.cpp:
ndbwaiter is no in impl class
ndb/src/ndbapi/Ndbif.cpp:
ndbwaiter is no in impl class
ndb/src/ndbapi/Ndbinit.cpp:
moved some Ndb things into impl class
ndb/src/ndbapi/TransporterFacade.hpp:
changed friend declaration
ndb/src/ndbapi/ndb_cluster_connection.cpp:
moved node selection things to cluster connection
moved things from cluster connection to cluster connection impl class
ndb/test/ndbapi/testNdbApi.cpp:
removed start transaction dgroup
ndb/tools/delete_all.cpp:
changed opts handling somewhat; introduced enum for options and common handling of option variables
ndb/tools/desc.cpp:
changed opts handling somewhat; introduced enum for options and common handling of option variables
ndb/tools/drop_index.cpp:
changed opts handling somewhat; introduced enum for options and common handling of option variables
ndb/tools/drop_tab.cpp:
changed opts handling somewhat; introduced enum for options and common handling of option variables
ndb/tools/listTables.cpp:
changed opts handling somewhat; introduced enum for options and common handling of option variables
ndb/tools/restore/restore_main.cpp:
changed opts handling somewhat; introduced enum for options and common handling of option variables
ndb/tools/select_all.cpp:
changed opts handling somewhat; introduced enum for options and common handling of option variables
ndb/tools/select_count.cpp:
changed opts handling somewhat; introduced enum for options and common handling of option variables
ndb/tools/waiter.cpp:
changed opts handling somewhat; introduced enum for options and common handling of option variables
sql/ha_ndbcluster.cc:
added control of usage of new node selection method
sql/mysqld.cc:
added control of usage of new node selection method
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
ndb/include/Makefile.am:
Auto merged
ndb/include/kernel/LogLevel.hpp:
Auto merged
ndb/include/mgmapi/mgmapi.h:
Auto merged
ndb/include/ndbapi/NdbConnection.hpp:
Auto merged
ndb/include/ndbapi/NdbDictionary.hpp:
Auto merged
ndb/src/common/debugger/EventLogger.cpp:
Auto merged
ndb/src/common/logger/FileLogHandler.cpp:
Auto merged
ndb/src/common/logger/Logger.cpp:
Auto merged
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
Auto merged
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
ndb/src/kernel/main.cpp:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
Auto merged
ndb/src/kernel/vm/Configuration.cpp:
Auto merged
ndb/src/mgmapi/mgmapi.cpp:
Auto merged
ndb/src/mgmsrv/InitConfigFileParser.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
Auto merged
ndb/src/mgmsrv/Services.cpp:
Auto merged
ndb/src/mgmsrv/Services.hpp:
Auto merged
ndb/src/mgmsrv/main.cpp:
Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
Auto merged
ndb/src/ndbapi/TransporterFacade.cpp:
Auto merged
ndb/src/ndbapi/ndberror.c:
Auto merged
ndb/tools/Makefile.am:
Auto merged
ndb/test/ndbapi/testDeadlock.cpp:
for broken compilers
sql/ha_ndbcluster.cc:
Use DBUG_PRINT since DBUG_FILE cannot be filtered out
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
missing DBUG_RETURN
ndb/include/kernel/signaldata/TupFrag.hpp:
fix some error codes
ndb/include/kernel/signaldata/TuxMaint.hpp:
fix some error codes
ndb/include/ndbapi/NdbBlob.hpp:
fix some error codes
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
fix some error codes
ndb/src/ndbapi/ndberror.c:
fix some error codes
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
ndb/include/Makefile.am:
Auto merged
ndb/include/mgmapi/mgmapi.h:
Auto merged
ndb/include/ndbapi/NdbConnection.hpp:
Auto merged
ndb/include/ndbapi/NdbDictionary.hpp:
Auto merged
ndb/src/common/debugger/EventLogger.cpp:
Auto merged
ndb/src/common/logger/Logger.cpp:
Auto merged
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
Auto merged
ndb/src/common/util/Makefile.am:
Auto merged
ndb/src/common/util/version.c:
Auto merged
ndb/src/kernel/blocks/dbacc/Makefile.am:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
Auto merged
ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
ndb/src/kernel/main.cpp:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
ndb/src/kernel/vm/Configuration.cpp:
Auto merged
ndb/src/mgmapi/mgmapi.cpp:
Auto merged
ndb/src/mgmsrv/CommandInterpreter.cpp:
Auto merged
ndb/src/mgmsrv/InitConfigFileParser.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
Auto merged
ndb/src/mgmsrv/Services.cpp:
Auto merged
ndb/src/mgmsrv/Services.hpp:
Auto merged
ndb/src/mgmsrv/main.cpp:
Auto merged
ndb/src/ndbapi/Makefile.am:
Auto merged
ndb/src/ndbapi/NdbBlob.cpp:
Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
Auto merged
ndb/src/ndbapi/ndberror.c:
Auto merged
ndb/test/ndbapi/Makefile.am:
Auto merged
ndb/test/tools/Makefile.am:
Auto merged
ndb/tools/Makefile.am:
Auto merged
scripts/make_win_src_distribution.sh:
Auto merged
ndb/include/kernel/AttributeDescriptor.hpp:
removed unused
ndb/include/kernel/ndb_limits.h:
removed unused
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Differentiate between nullable columns and null fields
TUP wants sum all other want #null cols
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
Differentiate between nullable columns and null fields
TUP wants sum all other want #null cols
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
Handle distribution key and collation in same subroutine
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Handle distribution key and collation in same subroutine
ndb/src/kernel/vm/VMSignal.hpp:
Increase size of signal->theData to 32k
ndb/test/ndbapi/testPartitioning.cpp:
better usage
ndb/test/ndbapi/testPartitioning.cpp:
Update test partitioning to add primary keys (distribution keys)
incase of either
- only 1 primary key
- primary keys with charsets
ndb/test/src/HugoCalculator.cpp:
Fix so that Hugo can cope with pk's in the "end" of the table
ndb/test/include/HugoOperations.hpp:
Fix pkRead on ordered index
ndb/test/ndbapi/testPartitioning.cpp:
Update test prg to handled ordered indexes aswell
ndb/test/src/HugoOperations.cpp:
Fix pkRead on ordered index
ndb/test/src/HugoTransactions.cpp:
Fix pkRead on ordered index
ndb/include/kernel/AttributeHeader.hpp:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
ndb/test/include/HugoOperations.hpp:
Auto merged
ndb/test/ndbapi/testOIBasic.cpp:
Auto merged
ndb/test/src/HugoOperations.cpp:
Auto merged
ndb/test/src/HugoTransactions.cpp:
Auto merged
ndb/test/src/UtilTransactions.cpp:
Auto merged
ndb/tools/select_count.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
ndb/include/ndbapi/NdbDictionary.hpp:
SCCS merged
ndb/src/ndbapi/NdbDictionary.cpp:
SCCS merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
SCCS merged
ndb/include/kernel/AttributeDescriptor.hpp:
wl-1732 support all charsets
ndb/include/kernel/ndb_limits.h:
wl-1732 support all charsets
ndb/include/kernel/signaldata/TuxBound.hpp:
wl-1732 support all charsets
ndb/include/util/NdbSqlUtil.hpp:
wl-1732 support all charsets
ndb/src/common/util/NdbSqlUtil.cpp:
wl-1732 support all charsets
ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
wl-1732 support all charsets
ndb/src/kernel/blocks/dbacc/DbaccInit.cpp:
wl-1732 support all charsets
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
wl-1732 support all charsets
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
wl-1732 support all charsets
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
wl-1732 support all charsets
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
wl-1732 support all charsets
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
wl-1732 support all charsets
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
wl-1732 support all charsets
ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp:
wl-1732 support all charsets
ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
wl-1732 support all charsets
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
wl-1732 support all charsets
ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
wl-1732 support all charsets
ndb/src/kernel/blocks/dbtux/DbtuxCmp.cpp:
wl-1732 support all charsets
ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp:
wl-1732 support all charsets
ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp:
wl-1732 support all charsets
ndb/src/kernel/blocks/dbtux/DbtuxMaint.cpp:
wl-1732 support all charsets
ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp:
wl-1732 support all charsets
ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
wl-1732 support all charsets
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
wl-1732 support all charsets
ndb/src/ndbapi/NdbOperationDefine.cpp:
wl-1732 support all charsets
ndb/src/ndbapi/NdbOperationSearch.cpp:
wl-1732 support all charsets
ndb/src/ndbapi/NdbScanOperation.cpp:
wl-1732 support all charsets
ndb/src/ndbapi/ndberror.c:
wl-1732 support all charsets
ndb/test/ndbapi/Makefile.am:
wl-1732 support all charsets
ndb/test/ndbapi/testOIBasic.cpp:
wl-1732 support all charsets
ndb/tools/desc.cpp:
wl-1732 support all charsets
ndb/include/kernel/ndb_limits.h:
#define for max null bits
ndb/include/kernel/signaldata/TupFrag.hpp:
Error code for too many nullbits
ndb/include/util/Bitmask.hpp:
Cosmetic fix
ndb/src/common/util/Bitmask.cpp:
handle (pos % 32) == 0
more unit tests
ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
Check bitmask overflow
ndb/src/ndbapi/ndberror.c:
New error code
ndb/test/ndbapi/testBitfield.cpp:
Update test program
ndb/test/run-test/daily-basic-tests.txt:
Add testBitfield to autotest
ndb/src/common/util/Bitmask.cpp:
Bug fixes + better unit test
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
fix
ndb/test/ndbapi/testBitfield.cpp:
impl. create_random_table and transactions
ndb/test/src/HugoCalculator.cpp:
Only use "var" size when var-size
All our programs which use mysql_real_connect() and mysql_connect() are updated accordingly, though I have deliberately
made mysqlimport not reconnect anymore (already true for mysqldump >= 4.1.8).
All Connector devs have been warned about the change I'm doing here - which was agreed with Monty,
and fixes BUG#2555.
VC++Files/libmysqltest/mytest.c:
explicit mention of reconnect (no behaviour change)
VC++Files/mysqlmanager/mysqlmanagerview.cpp:
explicit mention of reconnect (no behaviour change)
VC++Files/test1/mysql_thr.c:
explicit mention of reconnect (no behaviour change)
VC++Files/winmysqladmin/main.cpp:
explicit mention of reconnect (no behaviour change)
client/mysql.cc:
explicit mention of reconnect if embedded (no behaviour change)
client/mysqladmin.cc:
explicit mention of reconnect (no behaviour change)
client/mysqlbinlog.cc:
explicit mention of reconnect (no behaviour change)
client/mysqlcheck.c:
explicit mention of reconnect (no behaviour change)
client/mysqlimport.c:
explicit mention of NO reconnect (behaviour change). As most time is passed in LOAD DATA INFILE,
and as it does not make sense to reconnect after a partly failed LOAD... And as mysqlimport sometimes
does LOCK TABLES where we mustn't reconnect...
client/mysqlshow.c:
explicit mention of reconnect (no behaviour change)
client/mysqltest.c:
explicit mention of reconnect (no behaviour change).
Normally we should not reconnect (it's not good to have silent reconnection in the middle of a test),
but 5.0 is too touchy to change it now. I'm marking it TODO.
libmysql/libmysql.c:
explicit mention of reconnect (no behaviour change)
libmysqld/examples/builder-sample/emb_samples.cpp:
explicit mention of reconnect (no behaviour change)
ndb/test/ndbapi/flex_bench_mysql.cpp:
explicit mention of reconnect (no behaviour change)
ndb/tools/restore/consumer_restorem.cpp:
explicit mention of reconnect (no behaviour change)
sql-common/client.c:
Changing the default of libmysqlclient : it's now NO reconnection.
sql/repl_failsafe.cc:
explicit mention of reconnect (no behaviour change)
sql/slave.cc:
explicit mention of reconnect (no behaviour change)
tests/client_test.c:
explicit mention of reconnect (no behaviour change)
tests/connect_test.c:
explicit mention of reconnect (no behaviour change)
tests/deadlock_test.c:
explicit mention of reconnect (no behaviour change)
tests/insert_test.c:
explicit mention of reconnect (no behaviour change)
tests/list_test.c:
explicit mention of reconnect (no behaviour change)
tests/select_test.c:
explicit mention of reconnect (no behaviour change)
tests/showdb_test.c:
explicit mention of reconnect (no behaviour change)
tests/ssl_test.c:
explicit mention of reconnect (no behaviour change)
tests/thread_test.c:
explicit mention of reconnect (no behaviour change)
tools/mysqlmanager.c:
explicit mention of reconnect (no behaviour change)
into mysql.com:/home/jonas/src/wl2126
ndb/include/ndbapi/NdbDictionary.hpp:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
Auto merged
into mysql.com:/home/jonas/src/wl1744
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
ndb/include/Makefile.am:
Auto merged
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
Auto merged
ndb/src/common/util/version.c:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
Auto merged
ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
ndb/src/mgmsrv/main.cpp:
Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
ndb/include/ndbapi/NdbScanOperation.hpp:
Improved doc. a bit
ndb/src/ndbapi/NdbConnectionScan.cpp:
Set error code
ndb/src/ndbapi/NdbScanOperation.cpp:
Check error directly after taking mutex
ndb/test/ndbapi/testScan.cpp:
new scan test with lots of threads
ndb/test/run-test/daily-basic-tests.txt:
Added two more scan tests
Collapsed testTransactions & testOperations
