Commit graph

1399 commits

Author SHA1 Message Date
unknown
22c23f2247 improved print routine for NdbRecAttr 2005-01-06 12:10:49 +01:00
unknown
97682b76d2 ndbapi event code cleanup
+ some more docs on event


ndb/examples/ndbapi_event_example/ndbapi_event.cpp:
  ndbapi event code cleanup
ndb/include/kernel/signaldata/CreateEvnt.hpp:
  ndbapi event code cleanup
ndb/include/ndbapi/NdbDictionary.hpp:
  ndbapi event code cleanup
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  ndbapi event code cleanup
ndb/src/ndbapi/ndberror.c:
  ndbapi event code cleanup
2005-01-05 21:22:37 +01:00
unknown
41b5876edb last go at enabling using const NdbDictionary didn't work
+ some docs update on events


ndb/examples/ndbapi_simple_example/ndbapi_simple.cpp:
  updated example somewhat
ndb/include/ndbapi/NdbDictionary.hpp:
  fixed some docs
ndb/src/ndbapi/NdbDictionary.cpp:
  last go at enabling using const NdbDictionary didn't work
ndb/tools/desc.cpp:
  last go at enabling using const NdbDictionary didn't work
ndb/tools/listTables.cpp:
  last go at enabling using const NdbDictionary didn't work
2005-01-05 19:59:45 +01:00
unknown
3add897ef9 changed to using NdbTransaction scoped enums
and removed usage of Ndb::waitUntilReady()
2005-01-05 17:59:24 +01:00
unknown
ae736acfc3 ndb - getTable retry if DICT busy
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  getTable retry if DICT busy
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-01-05 13:37:34 +01:00
unknown
0e29e5e715 moved AbortOption and ExecType inside NdbTransaction
and provided some backwards compat functions
2005-01-05 04:13:46 +01:00
unknown
5499b0c5e1 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0-ndb
2005-01-04 22:01:23 +01:00
unknown
aae10cd184 changed documented method from get/setDistributionKey to get/setPartitionKey
+ some extra docs on the area
updated docs by removing som async stuff


ndb/include/ndbapi/NdbTransaction.hpp:
  mostly reformatting but also some more explicit references to objects and methods
2005-01-04 19:51:59 +01:00
unknown
c15e0f746b Hide internal unique index naming 2005-01-04 16:18:45 +01:00
unknown
584f68e8ad changed example names
and updated some docs
2005-01-04 16:15:15 +01:00
unknown
fcdd5e4333 deleted select all example as it is obsolete and replaced by ndbapi_scan_example
BitKeeper/deleted/.del-select_all.cpp~de02d1231f741270:
  Delete: ndb/examples/select_all/select_all.cpp
BitKeeper/deleted/.del-Makefile~a3c445ed68365196:
  Delete: ndb/examples/select_all/Makefile
2005-01-04 14:12:45 +01:00
unknown
46a847e700 changed some NdbConnection to NdbTransaction 2005-01-04 13:47:16 +01:00
unknown
c33a0fc5e4 updated all examples to use mysql c-api create table 2005-01-04 13:36:53 +01:00
unknown
d10e6cf0b5 added const declarations 2005-01-04 13:15:03 +01:00
unknown
fbe773128d changes ndb types include 2005-01-04 13:12:22 +01:00
unknown
aa210ae3a1 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2005-01-04 08:31:40 +01:00
unknown
a0e534c7e5 changed NdbConnection to NdbTransaction 2005-01-04 08:30:48 +01:00
unknown
6926e70385 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb


BitKeeper/etc/logging_ok:
  auto-union
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
2005-01-03 23:36:19 +01:00
unknown
3410ce0927 updated example1 to use mysql c-api for table creation 2005-01-03 23:16:59 +01:00
unknown
5c93c3e11c merge 5.0->5.0-ndb
BitKeeper/etc/logging_ok:
  auto-union
ndb/test/tools/Makefile.am:
  Auto merged
2005-01-03 21:42:43 +01:00
unknown
a14a225832 Merge mysql.com:/home/jonas/src/mysql-4.1-fix
into mysql.com:/home/jonas/src/mysql-5.0


ndb/include/ndb_global.h.in:
  Auto merged
ndb/include/ndb_types.h:
  Auto merged
2005-01-03 20:12:07 +01:00
unknown
cca9cd0bd6 updated ndbapi examples 2005-01-03 20:11:21 +01:00
unknown
9ecd9ac6b9 bug#7626 - post review version
ndb/include/ndb_global.h.in:
  move types into ndb_global.h.in
  Check sizeof of Uint8, Uint32 & Uint64
ndb/include/ndb_types.h:
  move types into ndb_global.h.in
2005-01-03 20:10:23 +01:00
unknown
e23ba8ea59 Merge mysql.com:/home/jonas/src/mysql-4.1-fix
into mysql.com:/home/jonas/src/mysql-5.0


ndb/include/ndb_types.h:
  Auto merged
2005-01-03 19:44:29 +01:00
unknown
e197fa459d bug#7626 - ndb UintPtr handling
ndb/include/ndb_types.h:
  redo UintPtr handling
2005-01-03 19:39:09 +01:00
unknown
423241da39 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
2005-01-03 19:09:10 +01:00
unknown
3c1b5f54f0 bug#7626 - ndb - non portable uint_ptr
ndb/include/ndb_types.h:
  redo UintPtr handling using SIZEOF_CHARP
ndb/test/tools/Makefile.am:
  remove unused defines
2005-01-03 19:08:27 +01:00
unknown
f3c625607c updated ndbapi examples
removed references to example2 (asynch api)


ndb/examples/Makefile:
  updated ndbapi examples
ndb/examples/ndbapi_example1/ndbapi_example1.cpp:
  updated ndbapi examples
ndb/examples/ndbapi_example2/Makefile:
  updated ndbapi examples
ndb/examples/ndbapi_example2/ndbapi_example2.cpp:
  updated ndbapi examples
ndb/examples/ndbapi_example3/Makefile:
  updated ndbapi examples
ndb/examples/ndbapi_example3/ndbapi_example3.cpp:
  updated ndbapi examples
ndb/examples/ndbapi_example4/Makefile:
  updated ndbapi examples
ndb/examples/ndbapi_example4/ndbapi_example4.cpp:
  updated ndbapi examples
ndb/examples/ndbapi_example5/Makefile:
  updated ndbapi examples
ndb/examples/ndbapi_example5/ndbapi_example5.cpp:
  updated ndbapi examples
ndb/include/ndbapi/Ndb.hpp:
  removed references to example2 (asynch api)
ndb/include/ndbapi/NdbRecAttr.hpp:
  removed references to example2 (asynch api)
2005-01-03 17:44:57 +01:00
unknown
cf3e08c566 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2005-01-03 13:52:16 +01:00
unknown
ab85635e68 Makefile:
fixed ndbapi_example     
ndbapi_example1.cpp:
  fixed ndbapi_example


ndb/examples/ndbapi_example1/ndbapi_example1.cpp:
  fixed ndbapi_example
ndb/examples/ndbapi_example1/Makefile:
  fixed ndbapi_example
2005-01-03 13:51:28 +01:00
unknown
fa7b260a11 ndb Updated example
ndb/examples/ndbapi_scan_example/ndbapi_scan.cpp:
  Updated example
ndb/include/ndbapi/NdbScanFilter.hpp:
  Fix default value
2005-01-03 12:07:47 +01:00
unknown
52722f1b43 updated ndbapi examples 2005-01-03 11:31:05 +01:00
unknown
a6ba55f2c0 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-01-03 09:36:25 +01:00
unknown
65defab653 merge 2005-01-03 09:24:18 +01:00
unknown
54a899e399 updated EventApi documentation 2005-01-02 13:21:17 +01:00
unknown
4cff6febfd Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0


ndb/include/ndbapi/Ndb.hpp:
  Auto merged
ndb/include/ndbapi/NdbConnection.hpp:
  Auto merged
ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged
2005-01-01 22:51:24 +01:00
unknown
11a2a35623 ndb - removed deprecated Ndb constructor
ndb/include/ndbapi/Ndb.hpp:
  removed deprecated methods
ndb/src/ndbapi/NdbPool.cpp:
  removed deprecated methods
ndb/src/ndbapi/NdbPoolImpl.cpp:
  removed deprecated methods
ndb/src/ndbapi/NdbPoolImpl.hpp:
  removed deprecated methods
ndb/src/ndbapi/Ndbinit.cpp:
  removed deprecated methods
ndb/tools/delete_all.cpp:
  removed deprecated methods
ndb/tools/desc.cpp:
  removed deprecated methods
ndb/tools/drop_index.cpp:
  removed deprecated methods
ndb/tools/drop_tab.cpp:
  removed deprecated methods
ndb/tools/restore/consumer_restore.cpp:
  removed deprecated methods
ndb/tools/restore/consumer_restore.hpp:
  removed deprecated methods
ndb/tools/restore/restore_main.cpp:
  removed deprecated methods
ndb/tools/select_all.cpp:
  removed deprecated methods
ndb/tools/select_count.cpp:
  removed deprecated methods
2005-01-01 19:25:31 +01:00
unknown
a61ef10262 ndb - post merge fixes
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  merge
2005-01-01 17:57:50 +01:00
unknown
2a5aa24fab merge
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
2005-01-01 14:01:37 +01:00
unknown
a142cea8a3 ndb - more removal of old constructor usage in test prgs
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
2005-01-01 09:28:24 +01:00
unknown
b99bea6704 manually merged
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
2004-12-31 15:26:24 +01:00
unknown
ede69a7581 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2004-12-31 11:39:43 +01:00
unknown
15f8439905 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/Users/mikron/mysql-5.0


ndb/src/kernel/blocks/suma/Suma.cpp:
  Auto merged
2004-12-31 10:39:24 +01:00
unknown
34e3b421cc Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb


ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged
2004-12-31 10:22:05 +01:00
unknown
0d87330888 merge 2004-12-31 10:21:33 +01:00
unknown
2709f21556 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb


BitKeeper/etc/logging_ok:
  auto-union
ndb/test/ndbapi/testBitfield.cpp:
  Auto merged
2004-12-31 10:07:49 +01:00
unknown
d85262308b merge 2004-12-31 09:51:28 +01:00
unknown
5098405248 merge
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
2004-12-31 06:36:32 +01:00
unknown
5df5f5c174 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
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
2004-12-31 06:14:18 +01:00
unknown
11b1f49f5f Bug #7593
Caused a hard limit of 64 unique indexes in cluster
2004-12-31 02:22:48 +01:00