mirror of
https://github.com/MariaDB/server.git
synced 2025-02-01 11:31:51 +01:00
4dabfa5de7
into mysql.com:/home/kent/bk/main/mysql-5.1 BUILD/Makefile.am: Auto merged BitKeeper/deleted/.del-ArrayFifoList.hpp~7036ae04dd7e7bd2: Auto merged BitKeeper/deleted/.del-ArrayList.hpp~44695d09b1a02179: Auto merged BitKeeper/deleted/.del-DbtupLCP.cpp~855b1ed3fbc86a42: Auto merged BitKeeper/deleted/.del-DbtupSystemRestart.cpp~15b54d7e4e75d2d: Auto merged BitKeeper/deleted/.del-DbtupUndoLog.cpp~5a2ef6e86b1404e9: Auto merged Makefile.am: Auto merged BitKeeper/deleted/.del-Makefile.am~2: Auto merged BitKeeper/deleted/.del-Makefile.am~ab5c84d46412dc2e: Auto merged BitKeeper/deleted/.del-Makefile.am~abb265028eb9b6a7: Auto merged BitKeeper/deleted/.del-Makefile.am~de166d6fcac3b9b6: Auto merged BitKeeper/deleted/.del-Makefile.am~e5b911533dad2713: Auto merged BitKeeper/deleted/.del-Makefile.am~ead19441cc5ff35c: Auto merged BitKeeper/deleted/.del-Makefile.am~f87185e232d7c4f: Auto merged BitKeeper/deleted/.del-Makefile.in: Auto merged BitKeeper/deleted/.del-MemoryChannelOSE.hpp: Auto merged BitKeeper/deleted/.del-MetaData.cpp~146ae9865dd35829: Auto merged BitKeeper/deleted/.del-MetaData.hpp~538342afcd8ac53c: Auto merged BitKeeper/deleted/.del-NdbCondition.c~ad83464328ab37af: Auto merged BitKeeper/deleted/.del-NdbCondition.c~ee56562abdd718cf: Auto merged BitKeeper/deleted/.del-NdbConditionOSE.h~455dd2c29c2e6344: Auto merged BitKeeper/deleted/.del-NdbDaemon.c~3b8101f376b28df: Auto merged BitKeeper/deleted/.del-NdbEnv.c~207f9ce9754c9e8a: Auto merged BitKeeper/deleted/.del-NdbEnv.c~bb6fe7572d45288a: Auto merged BitKeeper/deleted/.del-NdbErrHnd.cpp: Auto merged BitKeeper/deleted/.del-NdbHost.c~2c29816c77396d7b: Auto merged BitKeeper/deleted/.del-NdbHost.c~cf18d6b3c825180c: Auto merged BitKeeper/deleted/.del-NdbMem.c~6285b159985d46da: Auto merged BitKeeper/deleted/.del-NdbMem.c~6c2b317c1ce230ab: Auto merged BitKeeper/deleted/.del-NdbMem_SoftOse.cpp~9c61e311ec168d44: Auto merged BitKeeper/deleted/.del-NdbMutex.c~768131269bccca10: Auto merged BitKeeper/deleted/.del-NdbMutex.c~f4bdd19be08b84ab: Auto merged BitKeeper/deleted/.del-NdbOut.cpp~8caa99a0d729540c: Auto merged BitKeeper/deleted/.del-NdbSleep.c~b643ea3e7103eb62: Auto merged BitKeeper/deleted/.del-NdbSleep.c~b88fbc5b140de10d: Auto merged BitKeeper/deleted/.del-NdbTCP.c~1e9f416992352f6d: Auto merged BitKeeper/deleted/.del-NdbTCP.c~b09cdcbef3ea2c57: Auto merged BitKeeper/deleted/.del-NdbThread.c~2fe1fa5f47801772: Auto merged BitKeeper/deleted/.del-NdbThread.c~fe71a67b5c3a4724: Auto merged BitKeeper/deleted/.del-NdbTick.c~aa6385567216509d: Auto merged BitKeeper/deleted/.del-NdbTick.c~b76feba2cf1493d1: Auto merged BitKeeper/deleted/.del-OSE_Receiver.cpp: Auto merged BitKeeper/deleted/.del-OSE_Receiver.hpp: Auto merged BitKeeper/deleted/.del-OSE_Signals.hpp: Auto merged BitKeeper/deleted/.del-OSE_Transporter.cpp: Auto merged BitKeeper/deleted/.del-OSE_Transporter.hpp: Auto merged BitKeeper/deleted/.del-TraceNdbApi.hpp~7a7f0ae5b70358bc: Auto merged BitKeeper/deleted/.del-VerifyNdbApi.hpp~f417f78f7cd05935: Auto merged BitKeeper/deleted/.del-bcd.h~81fbfcc1530534da: Auto merged BitKeeper/deleted/.del-config-os2.h~a16b51851ddd317b: Auto merged BitKeeper/deleted/.del-dbGenerator.c~7509c19f70cad0bf: Auto merged BitKeeper/deleted/.del-dbGenerator.h~63f1aeb98260bcb7: Auto merged BitKeeper/deleted/.del-dbGenerator.h~e1aaa6725999d458: Auto merged BitKeeper/deleted/.del-dbPopulate.c~5dcff1c99783d83b: Auto merged BitKeeper/deleted/.del-dbPopulate.h~229a894b59d4da73: Auto merged BitKeeper/deleted/.del-ha_berkeley.cc: Auto merged BitKeeper/deleted/.del-ha_berkeley.h: Auto merged BitKeeper/deleted/.del-localDbPrepare.c~33a2c46afc8fac9a: Auto merged BitKeeper/deleted/.del-macros.h~58097d584e29b5df: Auto merged BitKeeper/deleted/.del-macros.h~742871fab0681964: Auto merged BitKeeper/deleted/.del-mainGenerator.c~2d1c8016f72b2517: Auto merged BitKeeper/deleted/.del-mainPopulate.c~37def9a44980b8ec: Auto merged BitKeeper/deleted/.del-mgmapi_logevent.cpp~f1e7cf3e70edc4: Auto merged BitKeeper/deleted/.del-mmslist.cpp: Auto merged BitKeeper/deleted/.del-my_lread.c: Auto merged BitKeeper/deleted/.del-my_lwrite.c: Auto merged BitKeeper/deleted/.del-my_os2cond.c~e3b520af1c371bb5: Auto merged BitKeeper/deleted/.del-my_os2dirsrch.c~4e2479b2abb2eb5a: Auto merged BitKeeper/deleted/.del-my_os2dirsrch.h~5011cbc657537d0: Auto merged BitKeeper/deleted/.del-my_os2dlfcn.c~6d94b488717683dd: Auto merged BitKeeper/deleted/.del-my_os2dlfcn.h0~eae8edb8555eff87: Auto merged BitKeeper/deleted/.del-my_os2file64.c~251fb8a1e950c31b: Auto merged BitKeeper/deleted/.del-my_os2thread.c~65dca991548cec2a: Auto merged BitKeeper/deleted/.del-my_os2tls.c~58ade7a0f70ad5ea: Auto merged BitKeeper/deleted/.del-mysqlmanager-pwgen.c~d8f5f91ec54432b9: Auto merged BitKeeper/deleted/.del-mysqlmanager.c~e97636d71145a0b: Auto merged BitKeeper/deleted/.del-mysqlmanagerc.c~4f6e3499e68508f6: Auto merged BitKeeper/deleted/.del-ndb_error.hpp~24468bb7f20a0b41: Auto merged BitKeeper/deleted/.del-ndb_error.hpp~45a2fef922beae3: Auto merged BitKeeper/deleted/.del-ndb_schema.hpp~de9c21185d6bfe4e: Auto merged BitKeeper/deleted/.del-ndbapi_async.cpp~319189569fb659ec: Auto merged BitKeeper/deleted/.del-ndbapi_async1.cpp~2995dac9b963a0d: Auto merged BitKeeper/deleted/.del-ndbapi_event.cpp~c5d949802966180: Auto merged BitKeeper/deleted/.del-ndbapi_retries.cpp~7301496d8c1c310a: Auto merged BitKeeper/deleted/.del-ndbapi_scan.cpp~14ed2aa9a5d9e597: Auto merged BitKeeper/deleted/.del-ndbapi_simple.cpp~80962179f3c2f5b8: Auto merged BitKeeper/deleted/.del-ndbapi_simple_index.cpp~4b95a4d71808b5b6: Auto merged BitKeeper/deleted/.del-print-limit-table~b8e808031daa3758: Auto merged BitKeeper/deleted/.del-raid.cc~488f5fa6538394e1: Auto merged BitKeeper/deleted/.del-raid.h~2d2503a66b128ac6: Auto merged BitKeeper/deleted/.del-raid2.c~fe7aea5fb4b9748c: Auto merged BitKeeper/deleted/.del-sql_manager.h: Auto merged BitKeeper/deleted/.del-testData.h~696038ea2623a90b: Auto merged BitKeeper/deleted/.del-testData.h~898b71d7c639319e: Auto merged BitKeeper/deleted/.del-testDefinitions.h~f18a4553579a3725: Auto merged BitKeeper/deleted/.del-userHandle.h~3275bb415e1ca2c2: Auto merged BitKeeper/deleted/.del-userHandle.h~ec22dc7a7ed2f81b: Auto merged BitKeeper/deleted/.del-userInterface.cpp~82ee612ab14b3d48: Auto merged BitKeeper/deleted/.del-userInterface.c~92a20032f7d1e91: Auto merged BitKeeper/deleted/.del-userInterface.h~1f76ad2f28b283fd: Auto merged BitKeeper/deleted/.del-userInterface.h~49139f029bbdaabc: Auto merged BitKeeper/deleted/.del-userTransaction.c~438012ecc761b776: Auto merged BitKeeper/deleted/.del-userTransaction.c~f50661b4f54b0bdd: Auto merged BitKeeper/deleted/.del-utv.h~f64af026b9705ebb: Auto merged BitKeeper/deleted/.del-vcdrfunc.h~85803875180684cd: Auto merged BitKeeper/deleted/.del-waiter.cpp~b188e4bfddf2cf98: Auto merged Docs/Makefile.am: Auto merged client/Makefile.am: Auto merged client/client_priv.h: Auto merged client/get_password.c: Auto merged client/mysql.cc: Auto merged client/mysql_upgrade.c: Auto merged client/mysqladmin.cc: Auto merged client/mysqlbinlog.cc: Auto merged client/mysqlcheck.c: Auto merged client/mysqldump.c: Auto merged client/mysqlimport.c: Auto merged client/mysqlshow.c: Auto merged client/mysqltest.c: Auto merged dbug/Makefile.am: Auto merged extra/Makefile.am: Auto merged extra/comp_err.c: Auto merged extra/perror.c: Auto merged extra/replace.c: Auto merged extra/resolveip.c: Auto merged include/Makefile.am: Auto merged include/base64.h: Auto merged include/config-netware.h: Auto merged include/config-win.h: Auto merged include/decimal.h: Auto merged include/errmsg.h: Auto merged include/ft_global.h: Auto merged include/heap.h: Auto merged include/m_ctype.h: Auto merged include/m_string.h: Auto merged include/my_base.h: Auto merged include/my_bitmap.h: Auto merged include/my_dbug.h: Auto merged include/my_global.h: Auto merged include/my_net.h: Auto merged include/my_no_pthread.h: Auto merged include/my_nosys.h: Auto merged include/my_pthread.h: Auto merged include/my_sys.h: Auto merged include/my_time.h: Auto merged include/my_tree.h: Auto merged include/my_xml.h: Auto merged include/myisam.h: Auto merged include/myisammrg.h: Auto merged include/mysql.h: Auto merged include/mysql_com.h: Auto merged include/mysys_err.h: Auto merged include/queues.h: Auto merged include/thr_alarm.h: Auto merged include/thr_lock.h: Auto merged include/violite.h: Auto merged libmysqld/Makefile.am: Auto merged libmysqld/emb_qcache.cc: Auto merged libmysqld/embedded_priv.h: Auto merged libmysqld/examples/Makefile.am: Auto merged libmysqld/libmysqld.c: Auto merged mysql-test/Makefile.am: Auto merged mysys/Makefile.am: Auto merged mysys/array.c: Auto merged mysys/base64.c: Auto merged mysys/charset-def.c: Auto merged mysys/default.c: Auto merged mysys/default_modify.c: Auto merged mysys/errors.c: Auto merged mysys/hash.c: Auto merged mysys/mf_dirname.c: Auto merged mysys/mf_format.c: Auto merged mysys/mf_iocache.c: Auto merged mysys/mf_iocache2.c: Auto merged mysys/mf_keycache.c: Auto merged mysys/mf_pack.c: Auto merged mysys/mf_path.c: Auto merged mysys/mf_tempdir.c: Auto merged mysys/mf_tempfile.c: Auto merged mysys/my_access.c: Auto merged mysys/my_alloc.c: Auto merged mysys/my_append.c: Auto merged mysys/my_bit.c: Auto merged mysys/my_bitmap.c: Auto merged mysys/my_clock.c: Auto merged mysys/my_compress.c: Auto merged mysys/my_copy.c: Auto merged mysys/my_create.c: Auto merged mysys/my_dup.c: Auto merged mysys/my_error.c: Auto merged mysys/my_file.c: Auto merged mysys/my_gethostbyname.c: Auto merged mysys/my_getopt.c: Auto merged mysys/my_getwd.c: Auto merged mysys/my_handler.c: Auto merged mysys/my_init.c: Auto merged mysys/my_lib.c: Auto merged mysys/my_lock.c: Auto merged mysys/my_malloc.c: Auto merged mysys/my_mkdir.c: Auto merged mysys/my_mmap.c: Auto merged mysys/my_net.c: Auto merged mysys/my_once.c: Auto merged mysys/my_open.c: Auto merged mysys/my_pread.c: Auto merged mysys/my_pthread.c: Auto merged mysys/my_redel.c: Auto merged mysys/my_rename.c: Auto merged mysys/my_seek.c: Auto merged mysys/my_sleep.c: Auto merged mysys/my_static.c: Auto merged mysys/my_symlink2.c: Auto merged mysys/my_thr_init.c: Auto merged mysys/mysys_priv.h: Auto merged mysys/ptr_cmp.c: Auto merged mysys/queues.c: Auto merged mysys/safemalloc.c: Auto merged mysys/string.c: Auto merged mysys/test_dir.c: Auto merged mysys/testhash.c: Auto merged mysys/thr_alarm.c: Auto merged mysys/thr_lock.c: Auto merged mysys/thr_mutex.c: Auto merged regex/Makefile.am: Auto merged scripts/Makefile.am: Auto merged server-tools/instance-manager/Makefile.am: Auto merged server-tools/instance-manager/buffer.cc: Auto merged server-tools/instance-manager/command.cc: Auto merged server-tools/instance-manager/command.h: Auto merged server-tools/instance-manager/commands.cc: Auto merged server-tools/instance-manager/commands.h: Auto merged server-tools/instance-manager/guardian.cc: Auto merged server-tools/instance-manager/guardian.h: Auto merged server-tools/instance-manager/instance.cc: Auto merged server-tools/instance-manager/instance.h: Auto merged server-tools/instance-manager/instance_map.cc: Auto merged server-tools/instance-manager/instance_map.h: Auto merged server-tools/instance-manager/instance_options.cc: Auto merged server-tools/instance-manager/instance_options.h: Auto merged server-tools/instance-manager/listener.cc: Auto merged server-tools/instance-manager/listener.h: Auto merged server-tools/instance-manager/log.cc: Auto merged server-tools/instance-manager/log.h: Auto merged server-tools/instance-manager/manager.cc: Auto merged server-tools/instance-manager/manager.h: Auto merged server-tools/instance-manager/messages.cc: Auto merged server-tools/instance-manager/mysql_connection.cc: Auto merged server-tools/instance-manager/mysql_connection.h: Auto merged server-tools/instance-manager/mysql_manager_error.h: Auto merged server-tools/instance-manager/mysqlmanager.cc: Auto merged server-tools/instance-manager/options.cc: Auto merged server-tools/instance-manager/options.h: Auto merged server-tools/instance-manager/parse.cc: Auto merged server-tools/instance-manager/parse.h: Auto merged server-tools/instance-manager/parse_output.cc: Auto merged server-tools/instance-manager/parse_output.h: Auto merged server-tools/instance-manager/priv.cc: Auto merged server-tools/instance-manager/priv.h: Auto merged server-tools/instance-manager/protocol.cc: Auto merged server-tools/instance-manager/protocol.h: Auto merged server-tools/instance-manager/thread_registry.cc: Auto merged server-tools/instance-manager/thread_registry.h: Auto merged server-tools/instance-manager/user_map.cc: Auto merged server-tools/instance-manager/user_map.h: Auto merged sql/Makefile.am: Auto merged sql/discover.cc: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged sql/field_conv.cc: Auto merged sql/filesort.cc: Auto merged sql/gen_lex_hash.cc: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/ha_ndbcluster.h: Auto merged sql/handler.cc: Auto merged sql/handler.h: Auto merged sql/hostname.cc: Auto merged sql/init.cc: Auto merged sql/item.cc: Auto merged sql/item.h: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_cmpfunc.h: Auto merged sql/item_create.cc: Auto merged sql/item_create.h: Auto merged sql/item_func.cc: Auto merged sql/item_func.h: Auto merged sql/item_geofunc.cc: Auto merged sql/item_geofunc.h: Auto merged sql/item_row.cc: Auto merged sql/item_row.h: Auto merged sql/item_strfunc.cc: Auto merged sql/item_strfunc.h: Auto merged sql/item_subselect.cc: Auto merged sql/item_subselect.h: Auto merged sql/item_sum.cc: Auto merged sql/item_sum.h: Auto merged sql/item_timefunc.cc: Auto merged sql/item_timefunc.h: Auto merged sql/item_uniq.cc: Auto merged sql/key.cc: Auto merged sql/lex.h: Auto merged sql/lex_symbol.h: Auto merged sql/lock.cc: Auto merged sql/log.cc: Auto merged sql/log_event.cc: Auto merged sql/log_event.h: Auto merged sql/my_decimal.cc: Auto merged sql/my_decimal.h: Auto merged sql/my_lock.c: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/net_serv.cc: Auto merged sql/opt_range.cc: Auto merged sql/opt_range.h: Auto merged sql/opt_sum.cc: Auto merged sql/parse_file.cc: Auto merged sql/parse_file.h: Auto merged sql/password.c: Auto merged sql/procedure.h: Auto merged sql/protocol.cc: Auto merged sql/protocol.h: Auto merged sql/records.cc: Auto merged sql/repl_failsafe.cc: Auto merged sql/set_var.cc: Auto merged sql/set_var.h: Auto merged sql/slave.cc: Auto merged sql/slave.h: Auto merged sql/sp.cc: Auto merged sql/sp.h: Auto merged sql/sp_cache.cc: Auto merged sql/sp_head.cc: Auto merged sql/sp_head.h: Auto merged sql/spatial.cc: Auto merged sql/spatial.h: Auto merged sql/sql_acl.cc: Auto merged sql/sql_acl.h: Auto merged sql/sql_analyse.cc: Auto merged sql/sql_analyse.h: Auto merged sql/sql_base.cc: Auto merged sql/sql_bitmap.h: Auto merged sql/sql_cache.cc: Auto merged sql/sql_cache.h: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_crypt.cc: Auto merged sql/sql_cursor.cc: Auto merged sql/sql_db.cc: Auto merged sql/sql_delete.cc: Auto merged sql/sql_derived.cc: Auto merged sql/sql_do.cc: Auto merged sql/sql_error.cc: Auto merged sql/sql_error.h: Auto merged sql/sql_handler.cc: Auto merged sql/sql_help.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_list.h: Auto merged sql/sql_load.cc: Auto merged sql/sql_manager.cc: Auto merged sql/sql_map.cc: Auto merged sql/sql_olap.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_prepare.cc: Auto merged sql/sql_rename.cc: Auto merged sql/sql_repl.cc: Auto merged sql/sql_repl.h: Auto merged sql/sql_select.cc: Auto merged sql/sql_select.h: Auto merged sql/sql_show.cc: Auto merged sql/sql_string.cc: Auto merged sql/sql_string.h: Auto merged sql/sql_table.cc: Auto merged sql/sql_test.cc: Auto merged sql/sql_trigger.cc: Auto merged sql/sql_trigger.h: Auto merged sql/sql_udf.cc: Auto merged sql/sql_union.cc: Auto merged sql/sql_update.cc: Auto merged sql/sql_view.cc: Auto merged sql-bench/Makefile.am: Auto merged sql-bench/as3ap.sh: Auto merged sql-bench/bench-count-distinct.sh: Auto merged sql-bench/bench-init.pl.sh: Auto merged sql-bench/compare-results.sh: Auto merged sql-bench/copy-db.sh: Auto merged sql/share/charsets/Index.xml: Auto merged sql/share/charsets/cp1250.xml: Auto merged sql/sql_view.h: Auto merged sql/sql_yacc.yy: Auto merged sql/stacktrace.c: Auto merged sql/stacktrace.h: Auto merged sql/strfunc.cc: Auto merged sql/structs.h: Auto merged sql/table.cc: Auto merged sql/table.h: Auto merged sql/time.cc: Auto merged sql/tztime.cc: Auto merged sql/tztime.h: Auto merged sql/udf_example.c: Auto merged sql/unireg.cc: Auto merged sql/unireg.h: Auto merged sql-bench/crash-me.sh: Auto merged sql-bench/run-all-tests.sh: Auto merged sql-bench/server-cfg.sh: Auto merged sql-bench/test-ATIS.sh: Auto merged sql-bench/test-alter-table.sh: Auto merged sql-bench/test-big-tables.sh: Auto merged sql-bench/test-connect.sh: Auto merged sql-bench/test-create.sh: Auto merged sql-bench/test-insert.sh: Auto merged sql-bench/test-select.sh: Auto merged sql-bench/test-transactions.sh: Auto merged sql-bench/test-wisconsin.sh: Auto merged sql-common/client.c: Auto merged sql-common/my_time.c: Auto merged storage/archive/ha_archive.cc: Auto merged storage/archive/ha_archive.h: Auto merged storage/blackhole/ha_blackhole.cc: Auto merged storage/blackhole/ha_blackhole.h: Auto merged storage/csv/ha_tina.cc: Auto merged storage/csv/ha_tina.h: Auto merged storage/example/ha_example.cc: Auto merged storage/example/ha_example.h: Auto merged storage/federated/ha_federated.cc: Auto merged storage/federated/ha_federated.h: Auto merged storage/heap/Makefile.am: Auto merged storage/heap/_check.c: Auto merged storage/heap/_rectest.c: Auto merged storage/heap/ha_heap.cc: Auto merged storage/heap/ha_heap.h: Auto merged storage/heap/heapdef.h: Auto merged storage/heap/hp_block.c: Auto merged storage/heap/hp_clear.c: Auto merged storage/heap/hp_close.c: Auto merged storage/heap/hp_create.c: Auto merged storage/heap/hp_delete.c: Auto merged storage/heap/hp_extra.c: Auto merged storage/heap/hp_hash.c: Auto merged storage/heap/hp_info.c: Auto merged storage/heap/hp_open.c: Auto merged storage/heap/hp_panic.c: Auto merged storage/heap/hp_rename.c: Auto merged storage/heap/hp_rfirst.c: Auto merged storage/heap/hp_rkey.c: Auto merged storage/heap/hp_rlast.c: Auto merged storage/heap/hp_rnext.c: Auto merged storage/heap/hp_rprev.c: Auto merged storage/heap/hp_rrnd.c: Auto merged storage/heap/hp_rsame.c: Auto merged storage/heap/hp_scan.c: Auto merged storage/heap/hp_static.c: Auto merged storage/heap/hp_test1.c: Auto merged storage/heap/hp_test2.c: Auto merged storage/heap/hp_update.c: Auto merged storage/heap/hp_write.c: Auto merged storage/innobase/Makefile.am: Auto merged storage/innobase/btr/Makefile.am: Auto merged storage/innobase/buf/Makefile.am: Auto merged storage/innobase/data/Makefile.am: Auto merged storage/innobase/dict/Makefile.am: Auto merged storage/innobase/dyn/Makefile.am: Auto merged storage/innobase/eval/Makefile.am: Auto merged storage/innobase/fil/Makefile.am: Auto merged storage/innobase/fsp/Makefile.am: Auto merged storage/innobase/fut/Makefile.am: Auto merged storage/innobase/ha/Makefile.am: Auto merged storage/innobase/handler/ha_innodb.cc: Auto merged storage/innobase/handler/ha_innodb.h: Auto merged storage/innobase/ibuf/Makefile.am: Auto merged storage/innobase/lock/Makefile.am: Auto merged storage/innobase/log/Makefile.am: Auto merged storage/innobase/mach/Makefile.am: Auto merged storage/innobase/mem/Makefile.am: Auto merged storage/innobase/mtr/Makefile.am: Auto merged storage/innobase/os/Makefile.am: Auto merged storage/innobase/page/Makefile.am: Auto merged storage/innobase/pars/Makefile.am: Auto merged storage/innobase/que/Makefile.am: Auto merged storage/innobase/read/Makefile.am: Auto merged storage/innobase/rem/Makefile.am: Auto merged storage/innobase/row/Makefile.am: Auto merged storage/innobase/srv/Makefile.am: Auto merged storage/innobase/sync/Makefile.am: Auto merged storage/innobase/thr/Makefile.am: Auto merged storage/innobase/trx/Makefile.am: Auto merged storage/innobase/usr/Makefile.am: Auto merged storage/innobase/ut/Makefile.am: Auto merged storage/myisam/Makefile.am: Auto merged storage/myisam/ft_boolean_search.c: Auto merged storage/myisam/ft_eval.c: Auto merged storage/myisam/ft_eval.h: Auto merged storage/myisam/ft_nlq_search.c: Auto merged storage/myisam/ft_parser.c: Auto merged storage/myisam/ft_static.c: Auto merged storage/myisam/ft_stem.c: Auto merged storage/myisam/ft_stopwords.c: Auto merged storage/myisam/ft_test1.c: Auto merged storage/myisam/ft_test1.h: Auto merged storage/myisam/ft_update.c: Auto merged storage/myisam/ftdefs.h: Auto merged storage/myisam/fulltext.h: Auto merged storage/myisam/ha_myisam.cc: Auto merged storage/myisam/ha_myisam.h: Auto merged storage/myisam/mi_cache.c: Auto merged storage/myisam/mi_changed.c: Auto merged storage/myisam/mi_check.c: Auto merged storage/myisam/mi_checksum.c: Auto merged storage/myisam/mi_close.c: Auto merged storage/myisam/mi_create.c: Auto merged storage/myisam/mi_dbug.c: Auto merged storage/myisam/mi_delete.c: Auto merged storage/myisam/mi_delete_all.c: Auto merged storage/myisam/mi_delete_table.c: Auto merged storage/myisam/mi_dynrec.c: Auto merged storage/myisam/mi_extra.c: Auto merged storage/myisam/mi_info.c: Auto merged storage/myisam/mi_key.c: Auto merged storage/myisam/mi_keycache.c: Auto merged storage/myisam/mi_locking.c: Auto merged storage/myisam/mi_log.c: Auto merged storage/myisam/mi_open.c: Auto merged storage/myisam/mi_packrec.c: Auto merged storage/myisam/mi_page.c: Auto merged storage/myisam/mi_panic.c: Auto merged storage/myisam/mi_preload.c: Auto merged storage/myisam/mi_range.c: Auto merged storage/myisam/mi_rename.c: Auto merged storage/myisam/mi_rfirst.c: Auto merged storage/myisam/mi_rkey.c: Auto merged storage/myisam/mi_rlast.c: Auto merged storage/myisam/mi_rnext.c: Auto merged storage/myisam/mi_rnext_same.c: Auto merged storage/myisam/mi_rprev.c: Auto merged storage/myisam/mi_rrnd.c: Auto merged storage/myisam/mi_rsame.c: Auto merged storage/myisam/mi_rsamepos.c: Auto merged storage/myisam/mi_scan.c: Auto merged storage/myisam/mi_search.c: Auto merged storage/myisam/mi_static.c: Auto merged storage/myisam/mi_statrec.c: Auto merged storage/myisam/mi_test1.c: Auto merged storage/myisam/mi_test2.c: Auto merged storage/myisam/mi_test3.c: Auto merged storage/myisam/mi_unique.c: Auto merged storage/myisam/mi_update.c: Auto merged storage/myisam/mi_write.c: Auto merged storage/myisam/myisam_ftdump.c: Auto merged storage/myisam/myisamchk.c: Auto merged storage/myisam/myisamdef.h: Auto merged storage/myisam/myisamlog.c: Auto merged storage/myisam/myisampack.c: Auto merged storage/myisam/rt_index.c: Auto merged storage/myisam/rt_index.h: Auto merged storage/myisam/rt_key.c: Auto merged storage/myisam/rt_key.h: Auto merged storage/myisam/rt_mbr.c: Auto merged storage/myisam/rt_mbr.h: Auto merged storage/myisam/rt_split.c: Auto merged storage/myisam/rt_test.c: Auto merged storage/myisam/sort.c: Auto merged storage/myisam/sp_defs.h: Auto merged storage/myisam/sp_key.c: Auto merged storage/myisam/sp_test.c: Auto merged storage/myisammrg/Makefile.am: Auto merged storage/myisammrg/ha_myisammrg.cc: Auto merged storage/myisammrg/ha_myisammrg.h: Auto merged storage/myisammrg/myrg_close.c: Auto merged storage/myisammrg/myrg_create.c: Auto merged storage/myisammrg/myrg_def.h: Auto merged storage/myisammrg/myrg_delete.c: Auto merged storage/myisammrg/myrg_extra.c: Auto merged storage/myisammrg/myrg_info.c: Auto merged storage/myisammrg/myrg_locking.c: Auto merged storage/myisammrg/myrg_open.c: Auto merged storage/myisammrg/myrg_panic.c: Auto merged storage/myisammrg/myrg_queue.c: Auto merged storage/myisammrg/myrg_range.c: Auto merged storage/myisammrg/myrg_rfirst.c: Auto merged storage/myisammrg/myrg_rkey.c: Auto merged storage/myisammrg/myrg_rlast.c: Auto merged storage/myisammrg/myrg_rnext.c: Auto merged storage/myisammrg/myrg_rnext_same.c: Auto merged storage/myisammrg/myrg_rprev.c: Auto merged storage/myisammrg/myrg_rrnd.c: Auto merged storage/myisammrg/myrg_rsame.c: Auto merged storage/myisammrg/myrg_static.c: Auto merged storage/myisammrg/myrg_update.c: Auto merged storage/myisammrg/myrg_write.c: Auto merged storage/ndb/include/debugger/DebuggerNames.hpp: Auto merged storage/ndb/include/debugger/EventLogger.hpp: Auto merged storage/ndb/include/debugger/GrepError.hpp: Auto merged storage/ndb/include/debugger/SignalLoggerManager.hpp: Auto merged storage/ndb/include/ndb_constants.h: Auto merged storage/ndb/include/ndb_global.h.in: Auto merged storage/ndb/include/ndb_init.h: Auto merged storage/ndb/include/ndb_types.h.in: Auto merged storage/ndb/include/ndb_version.h.in: Auto merged storage/ndb/include/editline/editline.h: Auto merged storage/ndb/include/kernel/AttributeDescriptor.hpp: Auto merged storage/ndb/include/kernel/AttributeHeader.hpp: Auto merged storage/ndb/include/kernel/AttributeList.hpp: Auto merged storage/ndb/include/kernel/BlockNumbers.h: Auto merged storage/ndb/include/kernel/GlobalSignalNumbers.h: Auto merged storage/ndb/include/kernel/GrepEvent.hpp: Auto merged storage/ndb/include/kernel/Interpreter.hpp: Auto merged storage/ndb/include/kernel/LogLevel.hpp: Auto merged storage/ndb/include/kernel/NodeBitmask.hpp: Auto merged storage/ndb/include/kernel/NodeInfo.hpp: Auto merged storage/ndb/include/kernel/NodeState.hpp: Auto merged storage/ndb/include/kernel/RefConvert.hpp: Auto merged storage/ndb/include/kernel/kernel_types.h: Auto merged storage/ndb/include/kernel/ndb_limits.h: Auto merged storage/ndb/include/kernel/signaldata/AbortAll.hpp: Auto merged storage/ndb/include/kernel/signaldata/AccFrag.hpp: Auto merged storage/ndb/include/kernel/signaldata/AccLock.hpp: Auto merged storage/ndb/include/kernel/signaldata/AccScan.hpp: Auto merged storage/ndb/include/kernel/signaldata/AccSizeAltReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/AlterIndx.hpp: Auto merged storage/ndb/include/kernel/signaldata/AlterTab.hpp: Auto merged storage/ndb/include/kernel/signaldata/AlterTable.hpp: Auto merged storage/ndb/include/kernel/signaldata/AlterTrig.hpp: Auto merged storage/ndb/include/kernel/signaldata/ApiBroadcast.hpp: Auto merged storage/ndb/include/kernel/signaldata/ApiRegSignalData.hpp: Auto merged storage/ndb/include/kernel/signaldata/ApiVersion.hpp: Auto merged storage/ndb/include/kernel/signaldata/ArbitSignalData.hpp: Auto merged storage/ndb/include/kernel/signaldata/AttrInfo.hpp: Auto merged storage/ndb/include/kernel/signaldata/BackupContinueB.hpp: Auto merged storage/ndb/include/kernel/signaldata/BackupImpl.hpp: Auto merged storage/ndb/include/kernel/signaldata/BackupSignalData.hpp: Auto merged storage/ndb/include/kernel/signaldata/BlockCommitOrd.hpp: Auto merged storage/ndb/include/kernel/signaldata/BuildIndx.hpp: Auto merged storage/ndb/include/kernel/signaldata/CheckNodeGroups.hpp: Auto merged storage/ndb/include/kernel/signaldata/CloseComReqConf.hpp: Auto merged storage/ndb/include/kernel/signaldata/CmInit.hpp: Auto merged storage/ndb/include/kernel/trigger_definitions.h: Auto merged storage/ndb/include/kernel/signaldata/CmRegSignalData.hpp: Auto merged storage/ndb/include/kernel/signaldata/CmvmiCfgConf.hpp: Auto merged storage/ndb/include/kernel/signaldata/CntrMasterConf.hpp: Auto merged storage/ndb/include/kernel/signaldata/CntrMasterReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/ConfigParamId.hpp: Auto merged storage/ndb/include/kernel/signaldata/ContinueFragmented.hpp: Auto merged storage/ndb/include/kernel/signaldata/CopyActive.hpp: Auto merged storage/ndb/include/kernel/signaldata/CopyFrag.hpp: Auto merged storage/ndb/include/kernel/signaldata/CopyGCIReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/CreateEvnt.hpp: Auto merged storage/ndb/include/kernel/signaldata/CreateFrag.hpp: Auto merged storage/ndb/include/kernel/signaldata/CreateFragmentation.hpp: Auto merged storage/ndb/include/kernel/signaldata/CreateIndx.hpp: Auto merged storage/ndb/include/kernel/signaldata/CreateTab.hpp: Auto merged storage/ndb/include/kernel/signaldata/CreateTable.hpp: Auto merged storage/ndb/include/kernel/signaldata/CreateTrig.hpp: Auto merged storage/ndb/include/kernel/signaldata/DiAddTab.hpp: Auto merged storage/ndb/include/kernel/signaldata/DiGetNodes.hpp: Auto merged storage/ndb/include/kernel/signaldata/DictLock.hpp: Auto merged storage/ndb/include/kernel/signaldata/DictSchemaInfo.hpp: Auto merged storage/ndb/include/kernel/signaldata/DictSizeAltReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/DictStart.hpp: Auto merged storage/ndb/include/kernel/signaldata/DictTabInfo.hpp: Auto merged storage/ndb/include/kernel/signaldata/DihAddFrag.hpp: Auto merged storage/ndb/include/kernel/signaldata/DihContinueB.hpp: Auto merged storage/ndb/include/kernel/signaldata/DihSizeAltReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/DihStartTab.hpp: Auto merged storage/ndb/include/kernel/signaldata/DihSwitchReplica.hpp: Auto merged storage/ndb/include/kernel/signaldata/DisconnectRep.hpp: Auto merged storage/ndb/include/kernel/signaldata/DropIndx.hpp: Auto merged storage/ndb/include/kernel/signaldata/DropTab.hpp: Auto merged storage/ndb/include/kernel/signaldata/DropTabFile.hpp: Auto merged storage/ndb/include/kernel/signaldata/DropTable.hpp: Auto merged storage/ndb/include/kernel/signaldata/DropTrig.hpp: Auto merged storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp: Auto merged storage/ndb/include/kernel/signaldata/EmptyLcp.hpp: Auto merged storage/ndb/include/kernel/signaldata/EndTo.hpp: Auto merged storage/ndb/include/kernel/signaldata/EventReport.hpp: Auto merged storage/ndb/include/kernel/signaldata/EventSubscribeReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/ExecFragReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/FailRep.hpp: Auto merged storage/ndb/include/kernel/signaldata/FireTrigOrd.hpp: Auto merged storage/ndb/include/kernel/signaldata/FsAppendReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/FsCloseReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/FsConf.hpp: Auto merged storage/ndb/include/kernel/signaldata/FsOpenReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/FsReadWriteReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/FsRef.hpp: Auto merged storage/ndb/include/kernel/signaldata/FsRemoveReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/GCPSave.hpp: Auto merged storage/ndb/include/kernel/signaldata/GetTabInfo.hpp: Auto merged storage/ndb/include/kernel/signaldata/GetTableId.hpp: Auto merged storage/ndb/include/kernel/signaldata/GrepImpl.hpp: Auto merged storage/ndb/include/kernel/signaldata/HotSpareRep.hpp: Auto merged storage/ndb/include/kernel/signaldata/IndxAttrInfo.hpp: Auto merged storage/ndb/include/kernel/signaldata/IndxKeyInfo.hpp: Auto merged storage/ndb/include/kernel/signaldata/InvalidateNodeLCPConf.hpp: Auto merged storage/ndb/include/kernel/signaldata/InvalidateNodeLCPReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/KeyInfo.hpp: Auto merged storage/ndb/include/kernel/signaldata/LCP.hpp: Auto merged storage/ndb/include/kernel/signaldata/ListTables.hpp: Auto merged storage/ndb/include/kernel/signaldata/LqhFrag.hpp: Auto merged storage/ndb/include/kernel/signaldata/LqhKey.hpp: Auto merged storage/ndb/include/kernel/signaldata/LqhSizeAltReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/LqhTransConf.hpp: Auto merged storage/ndb/include/kernel/signaldata/ManagementServer.hpp: Auto merged storage/ndb/include/kernel/signaldata/MasterGCP.hpp: Auto merged storage/ndb/include/kernel/signaldata/MasterLCP.hpp: Auto merged storage/ndb/include/kernel/signaldata/NFCompleteRep.hpp: Auto merged storage/ndb/include/kernel/signaldata/NdbSttor.hpp: Auto merged storage/ndb/include/kernel/signaldata/NdbfsContinueB.hpp: Auto merged storage/ndb/include/kernel/signaldata/NextScan.hpp: Auto merged storage/ndb/include/kernel/signaldata/NodeFailRep.hpp: Auto merged storage/ndb/include/kernel/signaldata/NodeStateSignalData.hpp: Auto merged storage/ndb/include/kernel/signaldata/PackedSignal.hpp: Auto merged storage/ndb/include/kernel/signaldata/PrepDropTab.hpp: Auto merged storage/ndb/include/kernel/signaldata/PrepFailReqRef.hpp: Auto merged storage/ndb/include/kernel/signaldata/ReadNodesConf.hpp: Auto merged storage/ndb/include/kernel/signaldata/RelTabMem.hpp: Auto merged storage/ndb/include/kernel/signaldata/RepImpl.hpp: Auto merged storage/ndb/include/kernel/signaldata/ResumeReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/ScanFrag.hpp: Auto merged storage/ndb/include/kernel/signaldata/ScanTab.hpp: Auto merged storage/ndb/include/kernel/signaldata/SetLogLevelOrd.hpp: Auto merged storage/ndb/include/kernel/signaldata/SetVarReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/SignalData.hpp: Auto merged storage/ndb/include/kernel/signaldata/SignalDataPrint.hpp: Auto merged storage/ndb/include/kernel/signaldata/SignalDroppedRep.hpp: Auto merged storage/ndb/include/kernel/signaldata/SrFragidConf.hpp: Auto merged storage/ndb/include/kernel/signaldata/StartFragReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/StartInfo.hpp: Auto merged storage/ndb/include/kernel/signaldata/StartMe.hpp: Auto merged storage/ndb/include/kernel/signaldata/StartOrd.hpp: Auto merged storage/ndb/include/kernel/signaldata/StartPerm.hpp: Auto merged storage/ndb/include/kernel/signaldata/StartRec.hpp: Auto merged storage/ndb/include/kernel/signaldata/StartTo.hpp: Auto merged storage/ndb/include/kernel/signaldata/StopMe.hpp: Auto merged storage/ndb/include/kernel/signaldata/StopPerm.hpp: Auto merged storage/ndb/include/kernel/signaldata/StopReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/SumaImpl.hpp: Auto merged storage/ndb/include/kernel/signaldata/SystemError.hpp: Auto merged storage/ndb/include/kernel/signaldata/TamperOrd.hpp: Auto merged storage/ndb/include/kernel/signaldata/TcCommit.hpp: Auto merged storage/ndb/include/kernel/signaldata/TcContinueB.hpp: Auto merged storage/ndb/include/kernel/signaldata/TcHbRep.hpp: Auto merged storage/ndb/include/kernel/signaldata/TcIndx.hpp: Auto merged storage/ndb/include/kernel/signaldata/TcKeyConf.hpp: Auto merged storage/ndb/include/kernel/signaldata/TcKeyFailConf.hpp: Auto merged storage/ndb/include/kernel/signaldata/TcKeyRef.hpp: Auto merged storage/ndb/include/kernel/signaldata/TcKeyReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/TcRollbackRep.hpp: Auto merged storage/ndb/include/kernel/signaldata/TcSizeAltReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/TestOrd.hpp: Auto merged storage/ndb/include/kernel/signaldata/TransIdAI.hpp: Auto merged storage/ndb/include/kernel/signaldata/TrigAttrInfo.hpp: Auto merged storage/ndb/include/kernel/signaldata/TupCommit.hpp: Auto merged storage/ndb/include/kernel/signaldata/TupFrag.hpp: Auto merged storage/ndb/include/kernel/signaldata/TupKey.hpp: Auto merged storage/ndb/include/kernel/signaldata/TupSizeAltReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/TuxBound.hpp: Auto merged storage/ndb/include/kernel/signaldata/TuxContinueB.hpp: Auto merged storage/ndb/include/kernel/signaldata/TuxMaint.hpp: Auto merged storage/ndb/include/kernel/signaldata/TuxSizeAltReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/UpdateTo.hpp: Auto merged storage/ndb/include/kernel/signaldata/UtilDelete.hpp: Auto merged storage/ndb/include/kernel/signaldata/UtilExecute.hpp: Auto merged storage/ndb/include/kernel/signaldata/UtilLock.hpp: Auto merged storage/ndb/include/kernel/signaldata/UtilPrepare.hpp: Auto merged storage/ndb/include/kernel/signaldata/UtilRelease.hpp: Auto merged storage/ndb/include/kernel/signaldata/UtilSequence.hpp: Auto merged storage/ndb/include/kernel/signaldata/WaitGCP.hpp: Auto merged storage/ndb/include/logger/ConsoleLogHandler.hpp: Auto merged storage/ndb/include/logger/FileLogHandler.hpp: Auto merged storage/ndb/include/logger/LogHandler.hpp: Auto merged storage/ndb/include/logger/Logger.hpp: Auto merged storage/ndb/include/logger/SysLogHandler.hpp: Auto merged storage/ndb/include/mgmapi/mgmapi.h: Auto merged storage/ndb/include/mgmapi/mgmapi_debug.h: Auto merged storage/ndb/include/mgmapi/ndb_logevent.h: Auto merged storage/ndb/include/mgmapi/ndbd_exit_codes.h: Auto merged storage/ndb/include/mgmcommon/ConfigRetriever.hpp: Auto merged storage/ndb/include/mgmcommon/IPCConfig.hpp: Auto merged storage/ndb/include/mgmcommon/MgmtErrorReporter.hpp: Auto merged storage/ndb/include/ndbapi/Ndb.hpp: Auto merged storage/ndb/include/ndbapi/NdbApi.hpp: Auto merged storage/ndb/include/ndbapi/NdbBlob.hpp: Auto merged storage/ndb/include/ndbapi/NdbDictionary.hpp: Auto merged storage/ndb/include/ndbapi/NdbError.hpp: Auto merged storage/ndb/include/ndbapi/NdbEventOperation.hpp: Auto merged storage/ndb/include/ndbapi/NdbIndexOperation.hpp: Auto merged storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp: Auto merged storage/ndb/include/ndbapi/NdbOperation.hpp: Auto merged storage/ndb/include/ndbapi/NdbPool.hpp: Auto merged storage/ndb/include/ndbapi/NdbRecAttr.hpp: Auto merged storage/ndb/include/ndbapi/NdbReceiver.hpp: Auto merged storage/ndb/include/ndbapi/NdbScanFilter.hpp: Auto merged storage/ndb/include/ndbapi/NdbScanOperation.hpp: Auto merged storage/ndb/include/ndbapi/NdbTransaction.hpp: Auto merged storage/ndb/include/ndbapi/ndb_cluster_connection.hpp: Auto merged storage/ndb/include/ndbapi/ndb_opt_defaults.h: Auto merged storage/ndb/include/ndbapi/ndbapi_limits.h: Auto merged storage/ndb/include/ndbapi/ndberror.h: Auto merged storage/ndb/include/newtonapi/dba.h: Auto merged storage/ndb/include/newtonapi/defs/pcn_types.h: Auto merged storage/ndb/include/portlib/NdbCondition.h: Auto merged storage/ndb/include/portlib/NdbConfig.h: Auto merged storage/ndb/include/portlib/NdbDaemon.h: Auto merged storage/ndb/include/portlib/NdbEnv.h: Auto merged storage/ndb/include/portlib/NdbHost.h: Auto merged storage/ndb/include/portlib/NdbMain.h: Auto merged storage/ndb/include/portlib/NdbMem.h: Auto merged storage/ndb/include/portlib/NdbMutex.h: Auto merged storage/ndb/include/portlib/NdbSleep.h: Auto merged storage/ndb/include/portlib/NdbTCP.h: Auto merged storage/ndb/include/portlib/NdbThread.h: Auto merged storage/ndb/include/portlib/NdbTick.h: Auto merged storage/ndb/include/portlib/PortDefs.h: Auto merged storage/ndb/include/portlib/prefetch.h: Auto merged storage/ndb/include/transporter/TransporterCallback.hpp: Auto merged storage/ndb/include/transporter/TransporterDefinitions.hpp: Auto merged storage/ndb/include/transporter/TransporterRegistry.hpp: Auto merged storage/ndb/include/util/BaseString.hpp: Auto merged storage/ndb/include/util/Bitmask.hpp: Auto merged storage/ndb/include/util/File.hpp: Auto merged storage/ndb/include/util/InputStream.hpp: Auto merged storage/ndb/include/util/NdbAutoPtr.hpp: Auto merged storage/ndb/include/util/NdbOut.hpp: Auto merged storage/ndb/include/util/NdbSqlUtil.hpp: Auto merged storage/ndb/include/util/OutputStream.hpp: Auto merged storage/ndb/include/util/Parser.hpp: Auto merged storage/ndb/include/util/Properties.hpp: Auto merged storage/ndb/include/util/SimpleProperties.hpp: Auto merged storage/ndb/include/util/SocketAuthenticator.hpp: Auto merged storage/ndb/include/util/SocketClient.hpp: Auto merged storage/ndb/include/util/SocketServer.hpp: Auto merged storage/ndb/include/util/UtilBuffer.hpp: Auto merged storage/ndb/include/util/Vector.hpp: Auto merged storage/ndb/include/util/basestring_vsnprintf.h: Auto merged storage/ndb/include/util/md5_hash.hpp: Auto merged storage/ndb/include/util/ndb_opts.h: Auto merged storage/ndb/include/util/random.h: Auto merged storage/ndb/include/util/socket_io.h: Auto merged storage/ndb/include/util/uucode.h: Auto merged storage/ndb/include/util/version.h: Auto merged storage/ndb/src/common/debugger/BlockNames.cpp: Auto merged storage/ndb/src/common/debugger/DebuggerNames.cpp: Auto merged storage/ndb/src/common/debugger/EventLogger.cpp: Auto merged storage/ndb/src/common/debugger/GrepError.cpp: Auto merged storage/ndb/src/common/debugger/SignalLoggerManager.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/AccLock.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/AlterIndx.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/AlterTab.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/AlterTable.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/AlterTrig.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/BackupImpl.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/BackupSignalData.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/CloseComReqConf.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/ContinueB.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/CopyGCI.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/CreateEvnt.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/CreateFragmentation.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/CreateIndx.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/CreateTrig.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/DihContinueB.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/DihSwitchReplicaReq.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/DisconnectRep.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/DropIndx.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/DropTab.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/DropTrig.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/FailRep.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/FireTrigOrd.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/FsAppendReq.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/FsCloseReq.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/FsConf.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/FsOpenReq.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/FsReadWriteReq.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/FsRef.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/GCPSave.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/IndxAttrInfo.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/IndxKeyInfo.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/LCP.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/LqhFrag.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/LqhKey.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/LqhTrans.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/MasterLCP.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/NFCompleteRep.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/NdbSttor.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/NdbfsContinueB.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/PackedSignal.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/PrepDropTab.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/PrepFailReqRef.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/ScanFrag.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/ScanTab.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/SignalDataPrint.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/SignalDroppedRep.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/SignalNames.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/StartRec.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/SumaImpl.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/SystemError.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/TcIndx.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/TcKeyConf.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/TcKeyRef.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/TcKeyReq.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/TcRollbackRep.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/TrigAttrInfo.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/TupCommit.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/TupKey.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/TuxMaint.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/UtilDelete.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/UtilExecute.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/UtilLock.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/UtilPrepare.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/UtilSequence.cpp: Auto merged storage/ndb/src/common/logger/ConsoleLogHandler.cpp: Auto merged storage/ndb/src/common/logger/FileLogHandler.cpp: Auto merged storage/ndb/src/common/logger/LogHandler.cpp: Auto merged storage/ndb/src/common/logger/LogHandlerList.cpp: Auto merged storage/ndb/src/common/logger/LogHandlerList.hpp: Auto merged storage/ndb/src/common/logger/Logger.cpp: Auto merged storage/ndb/src/common/logger/SysLogHandler.cpp: Auto merged storage/ndb/src/common/logger/listtest/LogHandlerListUnitTest.cpp: Auto merged storage/ndb/src/common/logger/listtest/LogHandlerListUnitTest.hpp: Auto merged storage/ndb/src/common/logger/loggertest/LoggerUnitTest.cpp: Auto merged storage/ndb/src/common/logger/loggertest/LoggerUnitTest.hpp: Auto merged storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp: Auto merged storage/ndb/src/common/mgmcommon/IPCConfig.cpp: Auto merged storage/ndb/src/common/mgmcommon/printConfig/printConfig.cpp: Auto merged storage/ndb/src/common/portlib/NdbCondition.c: Auto merged storage/ndb/src/common/portlib/NdbConfig.c: Auto merged storage/ndb/src/common/portlib/NdbDaemon.c: Auto merged storage/ndb/src/common/portlib/NdbEnv.c: Auto merged storage/ndb/src/common/portlib/NdbHost.c: Auto merged storage/ndb/src/common/portlib/NdbMem.c: Auto merged storage/ndb/src/common/portlib/NdbMutex.c: Auto merged storage/ndb/src/common/portlib/NdbPortLibTest.cpp: Auto merged storage/ndb/src/common/portlib/NdbSleep.c: Auto merged storage/ndb/src/common/portlib/NdbTCP.cpp: Auto merged storage/ndb/src/common/portlib/NdbThread.c: Auto merged storage/ndb/src/common/portlib/NdbTick.c: Auto merged storage/ndb/src/common/portlib/memtest.c: Auto merged storage/ndb/src/common/portlib/mmstest.cpp: Auto merged storage/ndb/src/common/portlib/munmaptest.cpp: Auto merged storage/ndb/src/common/portlib/win32/NdbCondition.c: Auto merged storage/ndb/src/common/portlib/win32/NdbDaemon.c: Auto merged storage/ndb/src/common/portlib/win32/NdbEnv.c: Auto merged storage/ndb/src/common/portlib/win32/NdbHost.c: Auto merged storage/ndb/src/common/portlib/win32/NdbMem.c: Auto merged storage/ndb/src/common/portlib/win32/NdbMutex.c: Auto merged storage/ndb/src/common/portlib/win32/NdbSleep.c: Auto merged storage/ndb/src/common/portlib/win32/NdbTCP.c: Auto merged storage/ndb/src/common/portlib/win32/NdbThread.c: Auto merged storage/ndb/src/common/portlib/win32/NdbTick.c: Auto merged storage/ndb/src/common/transporter/Packer.cpp: Auto merged storage/ndb/src/common/transporter/Packer.hpp: Auto merged storage/ndb/src/common/transporter/SCI_Transporter.cpp: Auto merged storage/ndb/src/common/transporter/SCI_Transporter.hpp: Auto merged storage/ndb/src/common/transporter/SHM_Buffer.hpp: Auto merged storage/ndb/src/common/transporter/SHM_Transporter.cpp: Auto merged storage/ndb/src/common/transporter/SHM_Transporter.hpp: Auto merged storage/ndb/src/common/transporter/SHM_Transporter.unix.cpp: Auto merged storage/ndb/src/common/transporter/SHM_Transporter.win32.cpp: Auto merged storage/ndb/src/common/transporter/SendBuffer.cpp: Auto merged storage/ndb/src/common/transporter/SendBuffer.hpp: Auto merged storage/ndb/src/common/transporter/TCP_Transporter.cpp: Auto merged storage/ndb/src/common/transporter/TCP_Transporter.hpp: Auto merged storage/ndb/src/common/transporter/Transporter.cpp: Auto merged storage/ndb/src/common/transporter/Transporter.hpp: Auto merged storage/ndb/src/common/transporter/TransporterInternalDefinitions.hpp: Auto merged storage/ndb/src/common/transporter/TransporterRegistry.cpp: Auto merged storage/ndb/src/common/transporter/basictest/basicTransporterTest.cpp: Auto merged storage/ndb/src/common/transporter/buddy.cpp: Auto merged storage/ndb/src/common/transporter/buddy.hpp: Auto merged storage/ndb/src/common/transporter/failoverSCI/failoverSCI.cpp: Auto merged storage/ndb/src/common/transporter/perftest/perfTransporterTest.cpp: Auto merged storage/ndb/src/common/transporter/priotest/prioSCI/prioSCI.cpp: Auto merged storage/ndb/src/common/transporter/priotest/prioSHM/prioSHM.cpp: Auto merged storage/ndb/src/common/transporter/priotest/prioTCP/prioTCP.cpp: Auto merged storage/ndb/src/common/transporter/priotest/prioTransporterTest.cpp: Auto merged storage/ndb/src/common/transporter/priotest/prioTransporterTest.hpp: Auto merged storage/ndb/src/common/util/BaseString.cpp: Auto merged storage/ndb/src/common/util/File.cpp: Auto merged storage/ndb/src/common/util/InputStream.cpp: Auto merged storage/ndb/src/common/util/NdbOut.cpp: Auto merged storage/ndb/src/common/util/NdbSqlUtil.cpp: Auto merged storage/ndb/src/common/util/OutputStream.cpp: Auto merged storage/ndb/src/common/util/Parser.cpp: Auto merged storage/ndb/src/common/util/Properties.cpp: Auto merged storage/ndb/src/common/util/SimpleProperties.cpp: Auto merged storage/ndb/src/common/util/SocketAuthenticator.cpp: Auto merged storage/ndb/src/common/util/SocketClient.cpp: Auto merged storage/ndb/src/common/util/SocketServer.cpp: Auto merged storage/ndb/src/common/util/basestring_vsnprintf.c: Auto merged storage/ndb/src/common/util/md5_hash.cpp: Auto merged storage/ndb/src/common/util/ndb_init.c: Auto merged storage/ndb/src/common/util/random.c: Auto merged storage/ndb/src/common/util/socket_io.cpp: Auto merged storage/ndb/src/common/util/strdup.c: Auto merged storage/ndb/src/common/util/filetest/FileUnitTest.cpp: Auto merged storage/ndb/src/common/util/filetest/FileUnitTest.hpp: Auto merged storage/ndb/src/common/util/testProperties/testProperties.cpp: Auto merged storage/ndb/src/common/util/testSimpleProperties/sp_test.cpp: Auto merged storage/ndb/src/common/util/uucode.c: Auto merged storage/ndb/src/common/util/version.c: Auto merged storage/ndb/src/cw/cpcc-win32/C++/CPC_GUI.cpp: Auto merged storage/ndb/src/cw/cpcc-win32/C++/CPC_GUI.h: Auto merged storage/ndb/src/cw/cpcc-win32/C++/NdbControls.cpp: Auto merged storage/ndb/src/cw/cpcc-win32/C++/StdAfx.cpp: Auto merged storage/ndb/src/cw/cpcc-win32/C++/StdAfx.h: Auto merged storage/ndb/src/cw/cpcc-win32/C++/TreeView.cpp: Auto merged storage/ndb/src/cw/cpcc-win32/C++/TreeView.h: Auto merged storage/ndb/src/cw/cpcc-win32/C++/resource.h: Auto merged storage/ndb/src/cw/cpcd/APIService.cpp: Auto merged storage/ndb/src/cw/cpcd/APIService.hpp: Auto merged storage/ndb/src/cw/cpcd/CPCD.cpp: Auto merged storage/ndb/src/cw/cpcd/CPCD.hpp: Auto merged storage/ndb/src/cw/cpcd/Monitor.cpp: Auto merged storage/ndb/src/cw/cpcd/Process.cpp: Auto merged storage/ndb/src/cw/cpcd/common.cpp: Auto merged storage/ndb/src/cw/cpcd/common.hpp: Auto merged storage/ndb/src/cw/cpcd/main.cpp: Auto merged storage/ndb/src/cw/test/socketclient/socketClientTest.cpp: Auto merged storage/ndb/src/cw/util/ClientInterface.cpp: Auto merged storage/ndb/src/cw/util/ClientInterface.hpp: Auto merged storage/ndb/src/cw/util/SocketRegistry.cpp: Auto merged storage/ndb/src/cw/util/SocketRegistry.hpp: Auto merged storage/ndb/src/cw/util/SocketService.cpp: Auto merged storage/ndb/src/cw/util/SocketService.hpp: Auto merged storage/ndb/src/kernel/SimBlockList.cpp: Auto merged storage/ndb/src/kernel/blocks/mutexes.hpp: Auto merged storage/ndb/src/kernel/main.cpp: Auto merged storage/ndb/src/kernel/blocks/backup/Backup.cpp: Auto merged storage/ndb/src/kernel/blocks/backup/Backup.hpp: Auto merged storage/ndb/src/kernel/blocks/backup/BackupFormat.hpp: Auto merged storage/ndb/src/kernel/blocks/backup/BackupInit.cpp: Auto merged storage/ndb/src/kernel/blocks/backup/FsBuffer.hpp: Auto merged storage/ndb/src/kernel/blocks/backup/read.cpp: Auto merged storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp: Auto merged storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp: Auto merged storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp: Auto merged storage/ndb/src/kernel/blocks/dbacc/DbaccInit.cpp: Auto merged storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp: Auto merged storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp: Auto merged storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp: Auto merged storage/ndb/src/kernel/blocks/dbdict/SchemaFile.hpp: Auto merged storage/ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp: Auto merged storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp: Auto merged storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp: Auto merged storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Auto merged storage/ndb/src/kernel/blocks/dbdih/Sysfile.hpp: Auto merged storage/ndb/src/kernel/blocks/dbdih/printSysfile/printSysfile.cpp: Auto merged storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp: Auto merged storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp: Auto merged storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Auto merged storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.cpp: Auto merged storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.hpp: Auto merged storage/ndb/src/kernel/blocks/dblqh/redoLogReader/redoLogFileReader.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp: Auto merged storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/AttributeOffset.hpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupBuffer.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupDebug.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupFixAlloc.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupPagMan.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupStoredProcDef.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupTabDesMan.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtux/Dbtux.hpp: Auto merged storage/ndb/src/kernel/blocks/dbtux/DbtuxCmp.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtux/DbtuxMaint.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtux/DbtuxNode.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtux/DbtuxSearch.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtux/DbtuxTree.cpp: Auto merged storage/ndb/src/kernel/blocks/dbutil/DbUtil.cpp: Auto merged storage/ndb/src/kernel/blocks/dbutil/DbUtil.hpp: Auto merged storage/ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp: Auto merged storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp: Auto merged storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp: Auto merged storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrSysTable.cpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/AsyncFileTest/AsyncFileTest.cpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/CircularIndex.cpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/CircularIndex.hpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/Filename.cpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/Filename.hpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/MemoryChannel.cpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/MemoryChannel.hpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/MemoryChannelTest/MemoryChannelTest.cpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.hpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/OpenFiles.hpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/Pool.hpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/VoidFs.cpp: Auto merged storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp: Auto merged storage/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp: Auto merged storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp: Auto merged storage/ndb/src/kernel/blocks/qmgr/timer.hpp: Auto merged storage/ndb/src/kernel/blocks/suma/Suma.cpp: Auto merged storage/ndb/src/kernel/blocks/suma/Suma.hpp: Auto merged storage/ndb/src/kernel/blocks/suma/SumaInit.cpp: Auto merged storage/ndb/src/kernel/blocks/trix/Trix.cpp: Auto merged storage/ndb/src/kernel/blocks/trix/Trix.hpp: Auto merged storage/ndb/src/kernel/error/ErrorHandlingMacros.hpp: Auto merged storage/ndb/src/kernel/error/ErrorReporter.cpp: Auto merged storage/ndb/src/kernel/error/ErrorReporter.hpp: Auto merged storage/ndb/src/kernel/error/TimeModule.cpp: Auto merged storage/ndb/src/kernel/error/TimeModule.hpp: Auto merged storage/ndb/src/kernel/error/ndbd_exit_codes.c: Auto merged storage/ndb/src/kernel/vm/Array.hpp: Auto merged storage/ndb/src/kernel/vm/ArrayPool.hpp: Auto merged storage/ndb/src/kernel/vm/CArray.hpp: Auto merged storage/ndb/src/kernel/vm/Callback.hpp: Auto merged storage/ndb/src/kernel/vm/ClusterConfiguration.cpp: Auto merged storage/ndb/src/kernel/vm/ClusterConfiguration.hpp: Auto merged storage/ndb/src/kernel/vm/Configuration.cpp: Auto merged storage/ndb/src/kernel/vm/Configuration.hpp: Auto merged storage/ndb/src/kernel/vm/DLFifoList.hpp: Auto merged storage/ndb/src/kernel/vm/DLHashTable.hpp: Auto merged storage/ndb/src/kernel/vm/DLHashTable2.hpp: Auto merged storage/ndb/src/kernel/vm/DLList.hpp: Auto merged storage/ndb/src/kernel/vm/DataBuffer.hpp: Auto merged storage/ndb/src/kernel/vm/Emulator.cpp: Auto merged storage/ndb/src/kernel/vm/Emulator.hpp: Auto merged storage/ndb/src/kernel/vm/FastScheduler.cpp: Auto merged storage/ndb/src/kernel/vm/FastScheduler.hpp: Auto merged storage/ndb/src/kernel/vm/GlobalData.hpp: Auto merged storage/ndb/src/kernel/vm/KeyDescriptor.hpp: Auto merged storage/ndb/src/kernel/vm/KeyTable.hpp: Auto merged storage/ndb/src/kernel/vm/KeyTable2.hpp: Auto merged storage/ndb/src/kernel/vm/LongSignal.hpp: Auto merged storage/ndb/src/kernel/vm/Mutex.cpp: Auto merged storage/ndb/src/kernel/vm/Mutex.hpp: Auto merged storage/ndb/src/kernel/vm/Prio.hpp: Auto merged storage/ndb/src/kernel/vm/RequestTracker.hpp: Auto merged storage/ndb/src/kernel/vm/SLList.hpp: Auto merged storage/ndb/src/kernel/vm/SafeCounter.cpp: Auto merged storage/ndb/src/kernel/vm/SafeCounter.hpp: Auto merged storage/ndb/src/kernel/vm/SectionReader.cpp: Auto merged storage/ndb/src/kernel/vm/SectionReader.hpp: Auto merged storage/ndb/src/kernel/vm/SignalCounter.hpp: Auto merged storage/ndb/src/kernel/vm/SimBlockList.hpp: Auto merged storage/ndb/src/kernel/vm/SimplePropertiesSection.cpp: Auto merged storage/ndb/src/kernel/vm/SimulatedBlock.cpp: Auto merged storage/ndb/src/kernel/vm/SimulatedBlock.hpp: Auto merged storage/ndb/src/kernel/vm/SuperPool.cpp: Auto merged storage/ndb/src/kernel/vm/SuperPool.hpp: Auto merged storage/ndb/src/kernel/vm/ThreadConfig.cpp: Auto merged storage/ndb/src/kernel/vm/ThreadConfig.hpp: Auto merged storage/ndb/src/kernel/vm/TimeQueue.cpp: Auto merged storage/ndb/src/kernel/vm/TimeQueue.hpp: Auto merged storage/ndb/src/kernel/vm/TransporterCallback.cpp: Auto merged storage/ndb/src/kernel/vm/VMSignal.cpp: Auto merged storage/ndb/src/kernel/vm/VMSignal.hpp: Auto merged storage/ndb/src/kernel/vm/WaitQueue.hpp: Auto merged storage/ndb/src/kernel/vm/WatchDog.cpp: Auto merged storage/ndb/src/kernel/vm/WatchDog.hpp: Auto merged storage/ndb/src/kernel/vm/al_test/arrayListTest.cpp: Auto merged storage/ndb/src/kernel/vm/al_test/arrayPoolTest.cpp: Auto merged storage/ndb/src/kernel/vm/al_test/main.cpp: Auto merged storage/ndb/src/kernel/vm/ndbd_malloc.cpp: Auto merged storage/ndb/src/kernel/vm/ndbd_malloc.hpp: Auto merged storage/ndb/src/kernel/vm/pc.hpp: Auto merged storage/ndb/src/kernel/vm/testCopy/rr.cpp: Auto merged storage/ndb/src/kernel/vm/testCopy/testCopy.cpp: Auto merged storage/ndb/src/kernel/vm/testDataBuffer/testDataBuffer.cpp: Auto merged storage/ndb/src/kernel/vm/testLongSig/testLongSig.cpp: Auto merged storage/ndb/src/kernel/vm/testSimplePropertiesSection/test.cpp: Auto merged storage/ndb/src/kernel/vm/testSuperPool.cpp: Auto merged storage/ndb/src/mgmapi/LocalConfig.cpp: Auto merged storage/ndb/src/mgmapi/LocalConfig.hpp: Auto merged storage/ndb/src/mgmapi/mgmapi.cpp: Auto merged storage/ndb/src/mgmapi/mgmapi_configuration.hpp: Auto merged storage/ndb/src/mgmapi/mgmapi_internal.h: Auto merged storage/ndb/src/mgmapi/ndb_logevent.cpp: Auto merged storage/ndb/src/mgmapi/ndb_logevent.hpp: Auto merged storage/ndb/src/mgmapi/test/keso.c: Auto merged storage/ndb/src/mgmapi/test/mgmSrvApi.cpp: Auto merged storage/ndb/src/mgmclient/CommandInterpreter.cpp: Auto merged storage/ndb/src/mgmclient/main.cpp: Auto merged storage/ndb/src/mgmclient/ndb_mgmclient.hpp: Auto merged storage/ndb/src/mgmclient/ndb_mgmclient.h: Auto merged storage/ndb/src/mgmclient/test_cpcd/test_cpcd.cpp: Auto merged storage/ndb/src/mgmsrv/Config.cpp: Auto merged storage/ndb/src/mgmsrv/Config.hpp: Auto merged storage/ndb/src/mgmsrv/ConfigInfo.cpp: Auto merged storage/ndb/src/mgmsrv/ConfigInfo.hpp: Auto merged storage/ndb/src/mgmsrv/InitConfigFileParser.cpp: Auto merged storage/ndb/src/mgmsrv/InitConfigFileParser.hpp: Auto merged storage/ndb/src/mgmsrv/MgmtSrvr.cpp: Auto merged storage/ndb/src/mgmsrv/MgmtSrvr.hpp: Auto merged storage/ndb/src/mgmsrv/MgmtSrvrConfig.cpp: Auto merged storage/ndb/src/mgmsrv/MgmtSrvrGeneralSignalHandling.cpp: Auto merged storage/ndb/src/mgmsrv/Services.cpp: Auto merged storage/ndb/src/mgmsrv/Services.hpp: Auto merged storage/ndb/src/mgmsrv/SignalQueue.cpp: Auto merged storage/ndb/src/mgmsrv/SignalQueue.hpp: Auto merged storage/ndb/src/mgmsrv/convertStrToInt.cpp: Auto merged storage/ndb/src/mgmsrv/convertStrToInt.hpp: Auto merged storage/ndb/src/mgmsrv/main.cpp: Auto merged storage/ndb/src/mgmsrv/mkconfig/mkconfig.cpp: Auto merged storage/ndb/src/ndbapi/API.hpp: Auto merged storage/ndb/src/ndbapi/ClusterMgr.cpp: Auto merged storage/ndb/src/ndbapi/ClusterMgr.hpp: Auto merged storage/ndb/src/ndbapi/DictCache.cpp: Auto merged storage/ndb/src/ndbapi/DictCache.hpp: Auto merged storage/ndb/src/ndbapi/Ndb.cpp: Auto merged storage/ndb/src/ndbapi/NdbApiSignal.cpp: Auto merged storage/ndb/src/ndbapi/NdbApiSignal.hpp: Auto merged storage/ndb/src/ndbapi/NdbBlob.cpp: Auto merged storage/ndb/src/ndbapi/NdbBlobImpl.hpp: Auto merged storage/ndb/src/ndbapi/NdbDictionary.cpp: Auto merged storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp: Auto merged storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp: Auto merged storage/ndb/src/ndbapi/NdbErrorOut.cpp: Auto merged storage/ndb/src/ndbapi/NdbEventOperation.cpp: Auto merged storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp: Auto merged storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp: Auto merged storage/ndb/src/ndbapi/NdbImpl.hpp: Auto merged storage/ndb/src/ndbapi/NdbIndexOperation.cpp: Auto merged storage/ndb/src/ndbapi/NdbLinHash.hpp: Auto merged storage/ndb/src/ndbapi/NdbOperation.cpp: Auto merged storage/ndb/src/ndbapi/NdbOperationDefine.cpp: Auto merged storage/ndb/src/ndbapi/NdbOperationExec.cpp: Auto merged storage/ndb/src/ndbapi/NdbOperationInt.cpp: Auto merged storage/ndb/src/ndbapi/NdbOperationScan.cpp: Auto merged storage/ndb/src/ndbapi/NdbOperationSearch.cpp: Auto merged storage/ndb/src/ndbapi/NdbPool.cpp: Auto merged storage/ndb/src/ndbapi/NdbPoolImpl.cpp: Auto merged storage/ndb/src/ndbapi/NdbPoolImpl.hpp: Auto merged storage/ndb/src/ndbapi/NdbRecAttr.cpp: Auto merged storage/ndb/src/ndbapi/NdbReceiver.cpp: Auto merged storage/ndb/src/ndbapi/NdbScanFilter.cpp: Auto merged storage/ndb/src/ndbapi/NdbScanOperation.cpp: Auto merged storage/ndb/src/ndbapi/NdbTransaction.cpp: Auto merged storage/ndb/src/ndbapi/NdbTransactionScan.cpp: Auto merged storage/ndb/src/ndbapi/NdbUtil.cpp: Auto merged storage/ndb/src/ndbapi/NdbUtil.hpp: Auto merged storage/ndb/src/ndbapi/NdbWaiter.hpp: Auto merged storage/ndb/src/ndbapi/Ndberr.cpp: Auto merged storage/ndb/src/ndbapi/Ndbif.cpp: Auto merged storage/ndb/src/ndbapi/Ndbinit.cpp: Auto merged storage/ndb/src/ndbapi/Ndblist.cpp: Auto merged storage/ndb/src/ndbapi/ObjectMap.hpp: Auto merged storage/ndb/src/ndbapi/SignalSender.cpp: Auto merged storage/ndb/src/ndbapi/SignalSender.hpp: Auto merged storage/ndb/src/ndbapi/TransporterFacade.cpp: Auto merged storage/ndb/src/ndbapi/TransporterFacade.hpp: Auto merged storage/ndb/src/ndbapi/ndb_cluster_connection.cpp: Auto merged storage/ndb/src/ndbapi/ndb_cluster_connection_impl.hpp: Auto merged storage/ndb/src/ndbapi/ndberror.c: Auto merged storage/ndb/src/ndbapi/signal-sender/SignalSender.cpp: Auto merged storage/ndb/src/ndbapi/signal-sender/SignalSender.hpp: Auto merged storage/ndb/test/include/CpcClient.hpp: Auto merged storage/ndb/test/include/HugoAsynchTransactions.hpp: Auto merged storage/ndb/test/include/HugoCalculator.hpp: Auto merged storage/ndb/test/include/HugoOperations.hpp: Auto merged storage/ndb/test/include/HugoTransactions.hpp: Auto merged storage/ndb/test/include/NDBT.hpp: Auto merged storage/ndb/test/include/NDBT_DataSet.hpp: Auto merged storage/ndb/test/include/NDBT_DataSetTransaction.hpp: Auto merged storage/ndb/test/include/NDBT_Error.hpp: Auto merged storage/ndb/test/include/NDBT_Output.hpp: Auto merged storage/ndb/test/include/NDBT_ResultRow.hpp: Auto merged storage/ndb/test/include/NDBT_ReturnCodes.h: Auto merged storage/ndb/test/include/NDBT_Stats.hpp: Auto merged storage/ndb/test/include/NDBT_Table.hpp: Auto merged storage/ndb/test/include/NDBT_Tables.hpp: Auto merged storage/ndb/test/include/NDBT_Test.hpp: Auto merged storage/ndb/test/include/NdbBackup.hpp: Auto merged storage/ndb/test/include/NdbConfig.hpp: Auto merged storage/ndb/test/include/NdbGrep.hpp: Auto merged storage/ndb/test/include/NdbRestarter.hpp: Auto merged storage/ndb/test/include/NdbRestarts.hpp: Auto merged storage/ndb/test/include/NdbSchemaCon.hpp: Auto merged storage/ndb/test/include/NdbSchemaOp.hpp: Auto merged storage/ndb/test/include/NdbTest.hpp: Auto merged storage/ndb/test/include/NdbTimer.hpp: Auto merged storage/ndb/test/include/TestNdbEventOperation.hpp: Auto merged storage/ndb/test/include/UtilTransactions.hpp: Auto merged storage/ndb/test/include/getarg.h: Auto merged storage/ndb/test/ndbapi/InsertRecs.cpp: Auto merged storage/ndb/test/ndbapi/ScanFilter.hpp: Auto merged storage/ndb/test/ndbapi/ScanFunctions.hpp: Auto merged storage/ndb/test/ndbapi/ScanInterpretTest.hpp: Auto merged storage/ndb/test/ndbapi/TraceNdbApi.cpp: Auto merged storage/ndb/test/ndbapi/VerifyNdbApi.cpp: Auto merged storage/ndb/test/ndbapi/acid.cpp: Auto merged storage/ndb/test/ndbapi/acid2.cpp: Auto merged storage/ndb/test/ndbapi/adoInsertRecs.cpp: Auto merged storage/ndb/test/ndbapi/asyncGenerator.cpp: Auto merged storage/ndb/test/ndbapi/benchronja.cpp: Auto merged storage/ndb/test/ndbapi/bulk_copy.cpp: Auto merged storage/ndb/test/ndbapi/cdrserver.cpp: Auto merged storage/ndb/test/ndbapi/celloDb.cpp: Auto merged storage/ndb/test/ndbapi/create_all_tabs.cpp: Auto merged storage/ndb/test/ndbapi/create_tab.cpp: Auto merged storage/ndb/test/ndbapi/drop_all_tabs.cpp: Auto merged storage/ndb/test/ndbapi/flexAsynch.cpp: Auto merged storage/ndb/test/ndbapi/flexBench.cpp: Auto merged storage/ndb/test/ndbapi/flexHammer.cpp: Auto merged storage/ndb/test/ndbapi/flexScan.cpp: Auto merged storage/ndb/test/ndbapi/flexTT.cpp: Auto merged storage/ndb/test/ndbapi/flexTimedAsynch.cpp: Auto merged storage/ndb/test/ndbapi/flex_bench_mysql.cpp: Auto merged storage/ndb/test/ndbapi/index.cpp: Auto merged storage/ndb/test/ndbapi/index2.cpp: Auto merged storage/ndb/test/ndbapi/initronja.cpp: Auto merged storage/ndb/test/ndbapi/interpreterInTup.cpp: Auto merged storage/ndb/test/ndbapi/mainAsyncGenerator.cpp: Auto merged storage/ndb/test/ndbapi/msa.cpp: Auto merged storage/ndb/test/ndbapi/ndb_async1.cpp: Auto merged storage/ndb/test/ndbapi/ndb_async2.cpp: Auto merged storage/ndb/test/ndbapi/ndb_user_populate.cpp: Auto merged storage/ndb/test/ndbapi/ndb_user_transaction.cpp: Auto merged storage/ndb/test/ndbapi/ndb_user_transaction2.cpp: Auto merged storage/ndb/test/ndbapi/ndb_user_transaction3.cpp: Auto merged storage/ndb/test/ndbapi/ndb_user_transaction4.cpp: Auto merged storage/ndb/test/ndbapi/ndb_user_transaction5.cpp: Auto merged storage/ndb/test/ndbapi/ndb_user_transaction6.cpp: Auto merged storage/ndb/test/ndbapi/restarter.cpp: Auto merged storage/ndb/test/ndbapi/restarter2.cpp: Auto merged storage/ndb/test/ndbapi/restarts.cpp: Auto merged storage/ndb/test/ndbapi/size.cpp: Auto merged storage/ndb/test/ndbapi/testBackup.cpp: Auto merged storage/ndb/test/ndbapi/testBasic.cpp: Auto merged storage/ndb/test/ndbapi/testBasicAsynch.cpp: Auto merged storage/ndb/test/ndbapi/testBlobs.cpp: Auto merged storage/ndb/test/ndbapi/testDataBuffers.cpp: Auto merged storage/ndb/test/ndbapi/testDeadlock.cpp: Auto merged storage/ndb/test/ndbapi/testDict.cpp: Auto merged storage/ndb/test/ndbapi/testGrepVerify.cpp: Auto merged storage/ndb/test/ndbapi/testIndex.cpp: Auto merged storage/ndb/test/ndbapi/testInterpreter.cpp: Auto merged storage/ndb/test/ndbapi/testMgm.cpp: Auto merged storage/ndb/test/ndbapi/testNdbApi.cpp: Auto merged storage/ndb/test/ndbapi/testNodeRestart.cpp: Auto merged storage/ndb/test/ndbapi/testOIBasic.cpp: Auto merged storage/ndb/test/ndbapi/testOperations.cpp: Auto merged storage/ndb/test/ndbapi/testOrderedIndex.cpp: Auto merged storage/ndb/test/ndbapi/testPartitioning.cpp: Auto merged storage/ndb/test/ndbapi/testReadPerf.cpp: Auto merged storage/ndb/test/ndbapi/bank/Bank.cpp: Auto merged storage/ndb/test/ndbapi/bank/Bank.hpp: Auto merged storage/ndb/test/ndbapi/bank/BankLoad.cpp: Auto merged storage/ndb/test/ndbapi/bank/bankCreator.cpp: Auto merged storage/ndb/test/ndbapi/bank/bankMakeGL.cpp: Auto merged storage/ndb/test/ndbapi/bank/bankSumAccounts.cpp: Auto merged storage/ndb/test/ndbapi/bank/bankTimer.cpp: Auto merged storage/ndb/test/ndbapi/bank/bankTransactionMaker.cpp: Auto merged storage/ndb/test/ndbapi/bank/bankValidateAllGLs.cpp: Auto merged storage/ndb/test/ndbapi/bank/testBank.cpp: Auto merged storage/ndb/test/ndbapi/bench/asyncGenerator.cpp: Auto merged storage/ndb/test/ndbapi/bench/dbGenerator.h: Auto merged storage/ndb/test/ndbapi/bench/dbPopulate.cpp: Auto merged storage/ndb/test/ndbapi/bench/dbPopulate.h: Auto merged storage/ndb/test/ndbapi/bench/macros.h: Auto merged storage/ndb/test/ndbapi/bench/mainAsyncGenerator.cpp: Auto merged storage/ndb/test/ndbapi/bench/mainPopulate.cpp: Auto merged storage/ndb/test/ndbapi/bench/ndb_async1.cpp: Auto merged storage/ndb/test/ndbapi/bench/ndb_async2.cpp: Auto merged storage/ndb/test/ndbapi/testRestartGci.cpp: Auto merged storage/ndb/test/ndbapi/testSRBank.cpp: Auto merged storage/ndb/test/ndbapi/testScan.cpp: Auto merged storage/ndb/test/ndbapi/testScanInterpreter.cpp: Auto merged storage/ndb/test/ndbapi/testScanPerf.cpp: Auto merged storage/ndb/test/ndbapi/testSystemRestart.cpp: Auto merged storage/ndb/test/ndbapi/testTimeout.cpp: Auto merged storage/ndb/test/ndbapi/testTransactions.cpp: Auto merged storage/ndb/test/ndbapi/test_event.cpp: Auto merged storage/ndb/test/ndbapi/test_event_merge.cpp: Auto merged storage/ndb/test/ndbapi/test_event_multi_table.cpp: Auto merged storage/ndb/test/ndbapi/userInterface.cpp: Auto merged storage/ndb/test/ndbapi/bench/ndb_error.hpp: Auto merged storage/ndb/test/ndbapi/bench/ndb_schema.hpp: Auto merged storage/ndb/test/ndbapi/bench/ndb_user_transaction.cpp: Auto merged storage/ndb/test/ndbapi/bench/ndb_user_transaction2.cpp: Auto merged storage/ndb/test/ndbapi/bench/ndb_user_transaction3.cpp: Auto merged storage/ndb/test/ndbapi/bench/ndb_user_transaction4.cpp: Auto merged storage/ndb/test/ndbapi/bench/ndb_user_transaction5.cpp: Auto merged storage/ndb/test/ndbapi/bench/ndb_user_transaction6.cpp: Auto merged storage/ndb/test/ndbapi/bench/testData.h: Auto merged storage/ndb/test/ndbapi/bench/testDefinitions.h: Auto merged storage/ndb/test/ndbapi/bench/userInterface.cpp: Auto merged storage/ndb/test/ndbapi/bench/userInterface.h: Auto merged storage/ndb/test/newtonapi/basic_test/basic/basic.cpp: Auto merged storage/ndb/test/newtonapi/basic_test/bulk_read/br_test.cpp: Auto merged storage/ndb/test/newtonapi/basic_test/common.cpp: Auto merged storage/ndb/test/newtonapi/basic_test/common.hpp: Auto merged storage/ndb/test/newtonapi/basic_test/ptr_binding/ptr_binding_test.cpp: Auto merged storage/ndb/test/newtonapi/basic_test/too_basic.cpp: Auto merged storage/ndb/test/newtonapi/perf_test/perf.cpp: Auto merged storage/ndb/test/odbc/SQL99_test/SQL99_test.cpp: Auto merged storage/ndb/test/odbc/SQL99_test/SQL99_test.h: Auto merged storage/ndb/test/odbc/client/NDBT_ALLOCHANDLE.cpp: Auto merged storage/ndb/test/odbc/client/NDBT_ALLOCHANDLE_HDBC.cpp: Auto merged storage/ndb/test/odbc/client/NDBT_SQLConnect.cpp: Auto merged storage/ndb/test/odbc/client/NDBT_SQLPrepare.cpp: Auto merged storage/ndb/test/odbc/client/SQLAllocEnvTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLAllocHandleTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLAllocHandleTest_bf.cpp: Auto merged storage/ndb/test/odbc/client/SQLBindColTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLBindParameterTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLCancelTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLCloseCursorTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLColAttributeTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLColAttributeTest1.cpp: Auto merged storage/ndb/test/odbc/client/SQLColAttributeTest2.cpp: Auto merged storage/ndb/test/odbc/client/SQLColAttributeTest3.cpp: Auto merged storage/ndb/test/odbc/client/SQLConnectTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLCopyDescTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLDescribeColTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLDisconnectTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLDriverConnectTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLEndTranTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLErrorTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLExecDirectTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLExecuteTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLFetchScrollTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLFetchTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLFreeHandleTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLFreeStmtTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLGetConnectAttrTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLGetCursorNameTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLGetDataTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLGetDescFieldTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLGetDescRecTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLGetDiagFieldTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLGetDiagRecSimpleTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLGetDiagRecTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLGetEnvAttrTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLGetFunctionsTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLGetInfoTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLGetStmtAttrTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLGetTypeInfoTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLMoreResultsTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLNumResultColsTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLParamDataTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLPrepareTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLPutDataTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLRowCountTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLSetConnectAttrTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLSetCursorNameTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLSetDescFieldTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLSetDescRecTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLSetEnvAttrTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLSetStmtAttrTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLTablesTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLTransactTest.cpp: Auto merged storage/ndb/test/odbc/client/common.hpp: Auto merged storage/ndb/test/odbc/client/main.cpp: Auto merged storage/ndb/test/odbc/driver/testOdbcDriver.cpp: Auto merged storage/ndb/test/odbc/test_compiler/test_compiler.cpp: Auto merged storage/ndb/test/run-test/main.cpp: Auto merged storage/ndb/test/run-test/run-test.hpp: Auto merged storage/ndb/test/src/CpcClient.cpp: Auto merged storage/ndb/test/src/HugoAsynchTransactions.cpp: Auto merged storage/ndb/test/src/HugoCalculator.cpp: Auto merged storage/ndb/test/src/HugoOperations.cpp: Auto merged storage/ndb/test/src/HugoTransactions.cpp: Auto merged storage/ndb/test/src/NDBT_Error.cpp: Auto merged storage/ndb/test/src/NDBT_Output.cpp: Auto merged storage/ndb/test/src/NDBT_ResultRow.cpp: Auto merged storage/ndb/test/src/NDBT_ReturnCodes.cpp: Auto merged storage/ndb/test/src/NDBT_Table.cpp: Auto merged storage/ndb/test/src/NDBT_Tables.cpp: Auto merged storage/ndb/test/src/NDBT_Test.cpp: Auto merged storage/ndb/test/src/NdbBackup.cpp: Auto merged storage/ndb/test/src/NdbConfig.cpp: Auto merged storage/ndb/test/src/NdbGrep.cpp: Auto merged storage/ndb/test/src/NdbRestarter.cpp: Auto merged storage/ndb/test/src/NdbRestarts.cpp: Auto merged storage/ndb/test/src/NdbSchemaCon.cpp: Auto merged storage/ndb/test/src/NdbSchemaOp.cpp: Auto merged storage/ndb/test/src/UtilTransactions.cpp: Auto merged storage/ndb/test/tools/copy_tab.cpp: Auto merged storage/ndb/test/tools/cpcc.cpp: Auto merged storage/ndb/test/tools/create_index.cpp: Auto merged storage/ndb/test/tools/hugoCalculator.cpp: Auto merged storage/ndb/test/tools/hugoFill.cpp: Auto merged storage/ndb/test/tools/hugoLoad.cpp: Auto merged storage/ndb/test/tools/hugoLockRecords.cpp: Auto merged storage/ndb/test/tools/hugoPkDelete.cpp: Auto merged storage/ndb/test/tools/hugoPkRead.cpp: Auto merged storage/ndb/test/tools/hugoPkReadRecord.cpp: Auto merged storage/ndb/test/tools/hugoPkUpdate.cpp: Auto merged storage/ndb/test/tools/hugoScanRead.cpp: Auto merged storage/ndb/test/tools/hugoScanUpdate.cpp: Auto merged storage/ndb/test/tools/restart.cpp: Auto merged storage/ndb/test/tools/transproxy.cpp: Auto merged storage/ndb/test/tools/verify_index.cpp: Auto merged storage/ndb/tools/delete_all.cpp: Auto merged storage/ndb/tools/desc.cpp: Auto merged storage/ndb/tools/drop_index.cpp: Auto merged storage/ndb/tools/drop_tab.cpp: Auto merged storage/ndb/tools/listTables.cpp: Auto merged storage/ndb/tools/ndb_condig.cpp: Auto merged storage/ndb/tools/ndb_test_platform.cpp: Auto merged storage/ndb/tools/ndbsql.cpp: Auto merged storage/ndb/tools/restore/Restore.cpp: Auto merged storage/ndb/tools/restore/Restore.hpp: Auto merged storage/ndb/tools/restore/consumer.cpp: Auto merged storage/ndb/tools/restore/consumer.hpp: Auto merged storage/ndb/tools/restore/consumer_printer.cpp: Auto merged storage/ndb/tools/restore/consumer_printer.hpp: Auto merged storage/ndb/tools/restore/consumer_restore.cpp: Auto merged storage/ndb/tools/restore/consumer_restore.hpp: Auto merged storage/ndb/tools/restore/consumer_restorem.cpp: Auto merged storage/ndb/tools/restore/restore_main.cpp: Auto merged storage/ndb/tools/select_all.cpp: Auto merged storage/ndb/tools/select_count.cpp: Auto merged storage/ndb/tools/waiter.cpp: Auto merged strings/Makefile.am: Auto merged strings/ctype-big5.c: Auto merged strings/ctype-bin.c: Auto merged strings/ctype-cp932.c: Auto merged strings/ctype-euc_kr.c: Auto merged strings/ctype-eucjpms.c: Auto merged strings/ctype-gb2312.c: Auto merged strings/ctype-gbk.c: Auto merged strings/ctype-latin1.c: Auto merged strings/ctype-mb.c: Auto merged strings/ctype-simple.c: Auto merged strings/ctype-sjis.c: Auto merged strings/ctype-tis620.c: Auto merged strings/ctype-ucs2.c: Auto merged strings/ctype-ujis.c: Auto merged strings/ctype-utf8.c: Auto merged strings/ctype-win1250ch.c: Auto merged strings/ctype.c: Auto merged strings/decimal.c: Auto merged strings/strxnmov.c: Auto merged strings/xml.c: Auto merged tests/Makefile.am: Auto merged tests/mysql_client_test.c: Auto merged vio/Makefile.am: Auto merged vio/vio.c: Auto merged vio/viosocket.c: Auto merged vio/viossl.c: Auto merged vio/viosslfactories.c: Auto merged zlib/Makefile.am: Auto merged
1761 lines
68 KiB
C++
1761 lines
68 KiB
C++
/* Copyright (C) 2003 MySQL AB
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; version 2 of the License.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
/**
|
|
@mainpage NDB API Programmers' Guide
|
|
|
|
This guide assumes a basic familiarity with MySQL Cluster concepts found
|
|
on http://dev.mysql.com/doc/mysql/en/NDBCluster.html .
|
|
Some of the fundamental ones are also described in section @ref secConcepts.
|
|
|
|
The NDB API is a MySQL Cluster application interface
|
|
that implements transactions.
|
|
The NDB API consists of the following fundamental classes:
|
|
- Ndb_cluster_connection, representing a connection to a cluster,
|
|
- Ndb is the main class, representing a connection to a database,
|
|
- NdbTransaction represents a transaction,
|
|
- NdbOperation represents an operation using a primary key,
|
|
- NdbScanOperation represents an operation performing a full table scan.
|
|
- NdbIndexOperation represents an operation using a unique hash index,
|
|
- NdbIndexScanOperation represents an operation performing a scan using
|
|
an ordered index,
|
|
- NdbRecAttr represents an attribute value
|
|
- NdbDictionary represents meta information about tables and attributes.
|
|
|
|
In addition, the NDB API defines a structure NdbError, which contains the
|
|
specification for an error.
|
|
|
|
It is also possible to receive "events" triggered when data in the database in changed.
|
|
This is done through the NdbEventOperation class.
|
|
|
|
There are also some auxiliary classes, which are listed in the class hierarchy.
|
|
|
|
The main structure of an application program is as follows:
|
|
-# Connect to a cluster using the Ndb_cluster_connection
|
|
object.
|
|
-# Initiate a database connection by constructing and initialising one or more Ndb objects.
|
|
-# Define and execute transactions using the NdbTransaction class.
|
|
-# Delete Ndb objects.
|
|
-# Terminate the connection to the cluster (terminate instance of Ndb_cluster_connection).
|
|
|
|
The procedure for using transactions is as follows:
|
|
-# Start transaction (instantiate an NdbTransaction object)
|
|
-# Add and define operations associated with the transaction using instances of one or more of the
|
|
NdbOperation, NdbScanOperation, NdbIndexOperation, and NdbIndexScanOperation classes
|
|
-# Execute transaction (call NdbTransaction::execute())
|
|
|
|
The operation can be of two different types,
|
|
<var>Commit</var> or <var>NoCommit</var>.
|
|
If the operation is of type <var>NoCommit</var>,
|
|
then the application program executes the operation part of a transaction,
|
|
but without actually committing the transaction.
|
|
After executing a <var>NoCommit</var> operation, the program can continue
|
|
to add and define more operations to the transaction
|
|
for later execution.
|
|
|
|
If the operation is of type <var>Commit</var>, then the transaction is
|
|
immediately committed. The transaction <em>must</em> be closed after it has been
|
|
commited (event if commit fails), and no further addition or definition of
|
|
operations for this transaction is allowed.
|
|
|
|
@section secSync Synchronous Transactions
|
|
|
|
Synchronous transactions are defined and executed as follows:
|
|
|
|
-# Start (create) the transaction, which is
|
|
referenced by an NdbTransaction object
|
|
(typically created using Ndb::startTransaction()).
|
|
At this point, the transaction is only being defined,
|
|
and is not yet sent to the NDB kernel.
|
|
-# Define operations and add them to the transaction, using one or more of
|
|
- NdbTransaction::getNdbOperation()
|
|
- NdbTransaction::getNdbScanOperation()
|
|
- NdbTransaction::getNdbIndexOperation()
|
|
- NdbTransaction::getNdbIndexScanOperation()
|
|
along with the appropriate methods of the respective NdbOperation class
|
|
(or one possiblt one or more of its subclasses).
|
|
Note that the transaction has still not yet been sent to the NDB kernel.
|
|
-# Execute the transaction, using the NdbTransaction::execute() method.
|
|
-# Close the transaction (call Ndb::closeTransaction()).
|
|
|
|
For an example of this process, see the program listing in
|
|
@ref ndbapi_simple.cpp.
|
|
|
|
To execute several parallel synchronous transactions, one can either
|
|
use multiple Ndb objects in several threads, or start multiple
|
|
application programs.
|
|
|
|
@section secNdbOperations Operations
|
|
|
|
A NdbTransaction consists of a list of operations, each of which is represented
|
|
by an instance of NdbOperation, NdbScanOperation, NdbIndexOperation, or
|
|
NdbIndexScanOperation.
|
|
|
|
<h3>Single row operations</h3>
|
|
After the operation is created using NdbTransaction::getNdbOperation()
|
|
(or NdbTransaction::getNdbIndexOperation()), it is defined in the following
|
|
three steps:
|
|
-# Define the standard operation type, using NdbOperation::readTuple()
|
|
-# Specify search conditions, using NdbOperation::equal()
|
|
-# Specify attribute actions, using NdbOperation::getValue()
|
|
|
|
Here are two brief examples illustrating this process. For the sake of
|
|
brevity, we omit error handling.
|
|
|
|
This first example uses an NdbOperation:
|
|
@code
|
|
// 1. Retrieve table object
|
|
myTable= myDict->getTable("MYTABLENAME");
|
|
|
|
// 2. Create
|
|
myOperation= myTransaction->getNdbOperation(myTable);
|
|
|
|
// 3. Define type of operation and lock mode
|
|
myOperation->readTuple(NdbOperation::LM_Read);
|
|
|
|
// 4. Specify Search Conditions
|
|
myOperation->equal("ATTR1", i);
|
|
|
|
// 5. Attribute Actions
|
|
myRecAttr= myOperation->getValue("ATTR2", NULL);
|
|
@endcode
|
|
For additional examples of this sort, see @ref ndbapi_simple.cpp.
|
|
|
|
The second example uses an NdbIndexOperation:
|
|
@code
|
|
// 1. Retrieve index object
|
|
myIndex= myDict->getIndex("MYINDEX", "MYTABLENAME");
|
|
|
|
// 2. Create
|
|
myOperation= myTransaction->getNdbIndexOperation(myIndex);
|
|
|
|
// 3. Define type of operation and lock mode
|
|
myOperation->readTuple(NdbOperation::LM_Read);
|
|
|
|
// 4. Specify Search Conditions
|
|
myOperation->equal("ATTR1", i);
|
|
|
|
// 5. Attribute Actions
|
|
myRecAttr = myOperation->getValue("ATTR2", NULL);
|
|
@endcode
|
|
Another example of this second type can be found in
|
|
@ref ndbapi_simple_index.cpp.
|
|
|
|
We will now discuss in somewhat greater detail each step involved in the
|
|
creation and use of synchronous transactions.
|
|
|
|
<h4>Step 1: Define single row operation type</h4>
|
|
The following operation types are supported:
|
|
-# NdbOperation::insertTuple() :
|
|
inserts a non-existing tuple
|
|
-# NdbOperation::writeTuple() :
|
|
updates an existing tuple if is exists,
|
|
otherwise inserts a new tuple
|
|
-# NdbOperation::updateTuple() :
|
|
updates an existing tuple
|
|
-# NdbOperation::deleteTuple() :
|
|
deletes an existing tuple
|
|
-# NdbOperation::readTuple() :
|
|
reads an existing tuple with specified lock mode
|
|
|
|
All of these operations operate on the unique tuple key.
|
|
(When NdbIndexOperation is used then all of these operations
|
|
operate on a defined unique hash index.)
|
|
|
|
@note If you want to define multiple operations within the same transaction,
|
|
then you need to call NdbTransaction::getNdbOperation() or
|
|
NdbTransaction::getNdbIndexOperation() for each operation.
|
|
|
|
<h4>Step 2: Specify Search Conditions</h4>
|
|
The search condition is used to select tuples. Search conditions are set using NdbOperation::equal().
|
|
|
|
<h4>Step 3: Specify Attribute Actions</h4>
|
|
Next, it is necessary to determine which attributes should be read or updated.
|
|
It is important to remember that:
|
|
- Deletes can neither read nor set values, but only delete them
|
|
- Reads can only read values
|
|
- Updates can only set values
|
|
Normally the attribute is identified by name, but it is
|
|
also possible to use the attribute's identity to determine the
|
|
attribute.
|
|
|
|
NdbOperation::getValue() returns an NdbRecAttr object
|
|
containing the read value.
|
|
To obtain the actual value, one of two methods can be used;
|
|
the application can either
|
|
- use its own memory (passed through a pointer aValue) to
|
|
NdbOperation::getValue(), or
|
|
- receive the attribute value in an NdbRecAttr object allocated
|
|
by the NDB API.
|
|
|
|
The NdbRecAttr object is released when Ndb::closeTransaction()
|
|
is called.
|
|
Thus, the application cannot reference this object following
|
|
any subsequent call to Ndb::closeTransaction().
|
|
Attempting to read data from an NdbRecAttr object before
|
|
calling NdbTransaction::execute() yields an undefined result.
|
|
|
|
|
|
@subsection secScan Scan Operations
|
|
|
|
Scans are roughly the equivalent of SQL cursors, providing a means to
|
|
preform high-speed row processing. A scan can be performed
|
|
on either a table (using @ref NdbScanOperation) or
|
|
an ordered index (by means of an @ref NdbIndexScanOperation).
|
|
|
|
Scan operations are characterised by the following:
|
|
- They can perform only reads (shared, exclusive or dirty)
|
|
- They can potentially work with multiple rows
|
|
- They can be used to update or delete multiple rows
|
|
- They can operate on several nodes in parallel
|
|
|
|
After the operation is created using NdbTransaction::getNdbScanOperation()
|
|
(or NdbTransaction::getNdbIndexScanOperation()),
|
|
it is carried out in the following three steps:
|
|
-# Define the standard operation type, using NdbScanOperation::readTuples()
|
|
-# Specify search conditions, using @ref NdbScanFilter and/or
|
|
@ref NdbIndexScanOperation::setBound()
|
|
-# Specify attribute actions, using NdbOperation::getValue()
|
|
-# Executing the transaction, using NdbTransaction::execute()
|
|
-# Traversing the result set by means of succssive calls to
|
|
NdbScanOperation::nextResult()
|
|
|
|
Here are two brief examples illustrating this process. Once again, in order
|
|
to keep things relatively short and simple, we will forego any error handling.
|
|
|
|
This first example performs a table scan, using an NdbScanOperation:
|
|
@code
|
|
// 1. Retrieve table object
|
|
myTable= myDict->getTable("MYTABLENAME");
|
|
|
|
// 2. Create
|
|
myOperation= myTransaction->getNdbScanOperation(myTable);
|
|
|
|
// 3. Define type of operation and lock mode
|
|
myOperation->readTuples(NdbOperation::LM_Read);
|
|
|
|
// 4. Specify Search Conditions
|
|
NdbScanFilter sf(myOperation);
|
|
sf.begin(NdbScanFilter::OR);
|
|
sf.eq(0, i); // Return rows with column 0 equal to i or
|
|
sf.eq(1, i+1); // column 1 equal to (i+1)
|
|
sf.end();
|
|
|
|
// 5. Attribute Actions
|
|
myRecAttr= myOperation->getValue("ATTR2", NULL);
|
|
@endcode
|
|
|
|
Our second example uses an NdbIndexScanOperation to perform an index scan:
|
|
@code
|
|
// 1. Retrieve index object
|
|
myIndex= myDict->getIndex("MYORDEREDINDEX", "MYTABLENAME");
|
|
|
|
// 2. Create
|
|
myOperation= myTransaction->getNdbIndexScanOperation(myIndex);
|
|
|
|
// 3. Define type of operation and lock mode
|
|
myOperation->readTuples(NdbOperation::LM_Read);
|
|
|
|
// 4. Specify Search Conditions
|
|
// All rows with ATTR1 between i and (i+1)
|
|
myOperation->setBound("ATTR1", NdbIndexScanOperation::BoundGE, i);
|
|
myOperation->setBound("ATTR1", NdbIndexScanOperation::BoundLE, i+1);
|
|
|
|
// 5. Attribute Actions
|
|
myRecAttr = MyOperation->getValue("ATTR2", NULL);
|
|
@endcode
|
|
|
|
Some additional discussion of each step required to perform a scan follows:
|
|
|
|
<h4>Step 1: Define Scan Operation Type</h4>
|
|
It is important to remember that only a single operation is supported for each scan operation
|
|
(@ref NdbScanOperation::readTuples() or @ref NdbIndexScanOperation::readTuples()).
|
|
|
|
@note If you want to define multiple scan operations within the same
|
|
transaction, then you need to call
|
|
NdbTransaction::getNdbScanOperation() or
|
|
NdbTransaction::getNdbIndexScanOperation() separately for <b>each</b> operation.
|
|
|
|
<h4>Step 2: Specify Search Conditions</h4>
|
|
The search condition is used to select tuples.
|
|
If no search condition is specified, the scan will return all rows
|
|
in the table.
|
|
|
|
The search condition can be an @ref NdbScanFilter (which can be used on both
|
|
@ref NdbScanOperation and @ref NdbIndexScanOperation) or bounds which
|
|
can only be used on index scans (@ref NdbIndexScanOperation::setBound()).
|
|
An index scan can use both NdbScanFilter and bounds.
|
|
|
|
@note When NdbScanFilter is used, each row is examined, whether or not it is
|
|
actually returned. However, when using bounds, only rows within the bounds will be examined.
|
|
|
|
<h4>Step 3: Specify Attribute Actions</h4>
|
|
|
|
Next, it is necessary to define which attributes should be read.
|
|
As with transaction attributes, scan attributes are defined by name but it is
|
|
also possible to use the attributes' identities to define attributes.
|
|
|
|
As previously discussed (see @ref secSync), the value read is returned as
|
|
an NdbRecAttr object by the NdbOperation::getValue() method.
|
|
|
|
<h3>Using Scan to Update/Delete</h3>
|
|
Scanning can also be used to update or delete rows.
|
|
This is performed by
|
|
-# Scanning using exclusive locks (using NdbOperation::LM_Exclusive)
|
|
-# When iterating through the result set, for each row optionally calling
|
|
either NdbScanOperation::updateCurrentTuple() or
|
|
NdbScanOperation::deleteCurrentTuple()
|
|
-# (If performing NdbScanOperation::updateCurrentTuple():)
|
|
Setting new values for records simply by using @ref NdbOperation::setValue().
|
|
NdbOperation::equal() should <em>not</em> be called in such cases, as the primary
|
|
key is retrieved from the scan.
|
|
|
|
@note The actual update or delete will not be performed until the next
|
|
call to NdbTransaction::execute(), just as with single row operations.
|
|
NdbTransaction::execute() also must be called before any locks are released;
|
|
see @ref secScanLocks for more information.
|
|
|
|
<h4>Features Specific to Index Scans</h4>
|
|
|
|
When performing an index scan, it is possible to
|
|
scan only a subset of a table using @ref NdbIndexScanOperation::setBound().
|
|
In addition, result sets can be sorted in either ascending or descending order, using
|
|
@ref NdbIndexScanOperation::readTuples(). Note that rows are returned unordered
|
|
by default, that is, unless <var>sorted</var> is set to <b>true</b>.
|
|
It is also important to note that, when using NdbIndexScanOperation::BoundEQ
|
|
on a partition key, only fragments containing rows will actually be scanned.
|
|
|
|
@note When performing a sorted scan, any value passed as the
|
|
NdbIndexScanOperation::readTuples() method's <code>parallel</code> argument
|
|
will be ignored and maximum parallelism will be used instead. In other words, all
|
|
fragments which it is possible to scan will be scanned simultaneously and in parallel
|
|
in such cases.
|
|
|
|
@subsection secScanLocks Lock handling with scans
|
|
|
|
Performing scans on either a tables or an index has the potential
|
|
return a great many records; however, Ndb will lock only a predetermined
|
|
number of rows per fragment at a time.
|
|
How many rows will be locked per fragment is controlled by the
|
|
<var>batch</var> parameter passed to NdbScanOperation::readTuples().
|
|
|
|
In order to allow the application to handle how locks are released,
|
|
NdbScanOperation::nextResult() has a Boolean parameter <var>fetch_allow</var>.
|
|
If NdbScanOperation::nextResult() is called with <var>fetch_allow</var> equal to
|
|
<b>false</b>, then no locks may be released as result of the function call.
|
|
Otherwise the locks for the current batch may be released.
|
|
|
|
This next example shows a scan delete that handle locks in an efficient manner.
|
|
For the sake of brevity, we omit error-handling.
|
|
@code
|
|
int check;
|
|
|
|
// Outer loop for each batch of rows
|
|
while((check = MyScanOperation->nextResult(true)) == 0)
|
|
{
|
|
do
|
|
{
|
|
// Inner loop for each row within batch
|
|
MyScanOperation->deleteCurrentTuple();
|
|
} while((check = MyScanOperation->nextResult(false)) == 0);
|
|
|
|
// When no more rows in batch, exeute all defined deletes
|
|
MyTransaction->execute(NoCommit);
|
|
}
|
|
@endcode
|
|
|
|
See @ref ndbapi_scan.cpp for a more complete example of a scan.
|
|
|
|
@section secError Error Handling
|
|
|
|
Errors can occur either when operations making up a transaction are being
|
|
defined, or when the transaction is actually being executed. Catching and
|
|
handling either sort of error requires testing the value returned by
|
|
NdbTransaction::execute(), and then, if an error is indicated (that is,
|
|
if this value is equal to -1), using the following two methods in order to
|
|
identify the error's type and location:
|
|
|
|
- NdbTransaction::getNdbErrorOperation() returns a reference to the
|
|
operation causing the most recent error.
|
|
- NdbTransaction::getNdbErrorLine() yields the method number of the
|
|
erroneous method in the operation.
|
|
|
|
This short example illustrates how to detect an error and to use these
|
|
two methods to identify it:
|
|
|
|
@code
|
|
theTransaction = theNdb->startTransaction();
|
|
theOperation = theTransaction->getNdbOperation("TEST_TABLE");
|
|
if (theOperation == NULL) goto error;
|
|
theOperation->readTuple(NdbOperation::LM_Read);
|
|
theOperation->setValue("ATTR_1", at1);
|
|
theOperation->setValue("ATTR_2", at1); // Error occurs here
|
|
theOperation->setValue("ATTR_3", at1);
|
|
theOperation->setValue("ATTR_4", at1);
|
|
|
|
if (theTransaction->execute(Commit) == -1) {
|
|
errorLine = theTransaction->getNdbErrorLine();
|
|
errorOperation = theTransaction->getNdbErrorOperation();
|
|
}
|
|
@endcode
|
|
|
|
Here <code>errorLine</code> will be 3, as the error occurred in the
|
|
third method called on the NdbOperation object (in this case,
|
|
<code>theOperation</code>); if the result of
|
|
NdbTransaction::getNdbErrorLine() is 0, this means that the error
|
|
occurred when the operations were executed. In this example,
|
|
<code>errorOperation</code> will be a pointer to the <code>theOperation</code>
|
|
object. The NdbTransaction::getNdbError() method returns an NdbError
|
|
object providing information about the error.
|
|
|
|
@note Transactions are <b>not</b> automatically closed when an error occurs. Call
|
|
Ndb::closeTransaction() to close the transaction.
|
|
|
|
One recommended way to handle a transaction failure
|
|
(i.e. an error is reported) is to:
|
|
-# Rollback transaction (call NdbTransaction::execute() with a special parameter)
|
|
-# Close transaction (call NdbTransaction::closeTransaction())
|
|
-# If the error was temporary, attempt to restart the transaction
|
|
|
|
Several errors can occur when a transaction contains multiple
|
|
operations which are simultaneously executed.
|
|
In this case the application has to go through all operations
|
|
and query their NdbError objects to find out what really happened.
|
|
|
|
It is also important to note that errors can occur even when a commit is
|
|
reported as successful. In order to handle such situations, the NDB API
|
|
provides an additional NdbTransaction::commitStatus() method to check the
|
|
transactions's commit status.
|
|
|
|
******************************************************************************/
|
|
|
|
/**
|
|
* @page ndbapi_simple.cpp ndbapi_simple.cpp
|
|
* @include ndbapi_simple.cpp
|
|
*/
|
|
|
|
#ifndef DOXYGEN_SHOULD_SKIP_INTERNAL
|
|
/**
|
|
* @page ndbapi_async.cpp ndbapi_async.cpp
|
|
* @include ndbapi_async.cpp
|
|
*/
|
|
/**
|
|
* @page ndbapi_async1.cpp ndbapi_async1.cpp
|
|
* @include ndbapi_async1.cpp
|
|
*/
|
|
#endif
|
|
|
|
/**
|
|
* @page ndbapi_retries.cpp ndbapi_retries.cpp
|
|
* @include ndbapi_retries.cpp
|
|
*/
|
|
|
|
/**
|
|
* @page ndbapi_simple_index.cpp ndbapi_simple_index.cpp
|
|
* @include ndbapi_simple_index.cpp
|
|
*/
|
|
|
|
/**
|
|
* @page ndbapi_scan.cpp ndbapi_scan.cpp
|
|
* @include ndbapi_scan.cpp
|
|
*/
|
|
|
|
/**
|
|
* @page ndbapi_event.cpp ndbapi_event.cpp
|
|
* @include ndbapi_event.cpp
|
|
*/
|
|
|
|
|
|
/**
|
|
@page secAdapt Adaptive Send Algorithm
|
|
|
|
At the time of "sending" a transaction
|
|
(using NdbTransaction::execute()), the transactions
|
|
are in reality <em>not</em> immediately transfered to the NDB Kernel.
|
|
Instead, the "sent" transactions are only kept in a
|
|
special send list (buffer) in the Ndb object to which they belong.
|
|
The adaptive send algorithm decides when transactions should
|
|
actually be transferred to the NDB kernel.
|
|
|
|
The NDB API is designed as a multi-threaded interface and so
|
|
it is often desirable to transfer database operations from more than
|
|
one thread at a time.
|
|
The NDB API keeps track of which Ndb objects are active in transferring
|
|
information to the NDB kernel and the expected amount of threads to
|
|
interact with the NDB kernel.
|
|
Note that a given instance of Ndb should be used in at most one thread;
|
|
different threads should <em>not</em> use the same Ndb object.
|
|
|
|
There are four conditions leading to the transfer of database
|
|
operations from Ndb object buffers to the NDB kernel:
|
|
-# The NDB Transporter (TCP/IP, SCI or shared memory)
|
|
decides that a buffer is full and sends it off.
|
|
The buffer size is implementation-dependent and
|
|
may change between MySQL Cluster releases.
|
|
On TCP/IP the buffer size is usually around 64 KB;
|
|
Since each Ndb object provides a single buffer per storage node,
|
|
the notion of a "full" buffer is local to this storage node.
|
|
-# The accumulation of statistical data on transferred information
|
|
may force sending of buffers to all storage nodes.
|
|
-# Every 10 ms, a special transmission thread checks whether or not
|
|
any send activity has occurred. If not, then the thread will
|
|
force transmission to all nodes.
|
|
This means that 20 ms is the maximum time database operations
|
|
are kept waiting before being sent off. The 10-millisecond limit
|
|
is likely to become a configuration parameter in
|
|
future releases of MySQL Cluster; however, for checks that
|
|
are more frequent than each 10 ms,
|
|
additional support from the operating system is required.
|
|
-# For methods that are affected by the adaptive send alorithm
|
|
(such as NdbTransaction::execute()), there is a <var>force</var>
|
|
parameter
|
|
that overrides its default behaviour in this regard and forces
|
|
immediate transmission to all nodes. See the inidvidual NDB API class
|
|
listings for more information.
|
|
|
|
@note The conditions listed above are subject to change in future releases
|
|
of MySQL Cluster.
|
|
*/
|
|
|
|
#ifndef DOXYGEN_SHOULD_SKIP_INTERNAL
|
|
/**
|
|
|
|
For each of these "sent" transactions, there are three
|
|
possible states:
|
|
-# Waiting to be transferred to NDB Kernel.
|
|
-# Has been transferred to the NDB Kernel and is currently
|
|
being processed.
|
|
-# Has been transferred to the NDB Kernel and has
|
|
finished processing.
|
|
Now it is waiting for a call to a poll method.
|
|
(When the poll method is invoked,
|
|
then the transaction callback method will be executed.)
|
|
|
|
The poll method invoked (either Ndb::pollNdb() or Ndb::sendPollNdb())
|
|
will return when:
|
|
-# at least 'minNoOfEventsToWakeup' of the transactions
|
|
in the send list have transitioned to state 3 as described above, and
|
|
-# all of these transactions have executed their callback methods.
|
|
*/
|
|
#endif
|
|
|
|
/**
|
|
@page secConcepts MySQL Cluster Concepts
|
|
|
|
The <em>NDB Kernel</em> is the collection of storage nodes
|
|
belonging to a MySQL Cluster.
|
|
The application programmer can for most purposes view the
|
|
set of all storage nodes as a single entity.
|
|
Each storage node is made up of three main components:
|
|
- TC : The transaction co-ordinator
|
|
- ACC : Index storage component
|
|
- TUP : Data storage component
|
|
|
|
When an application program executes a transaction,
|
|
it connects to one transaction co-ordinator on one storage node.
|
|
Usually, the programmer does not need to specify which TC should be used,
|
|
but in some cases when performance is important, the programmer can
|
|
provide "hints" to use a certain TC.
|
|
(If the node with the desired transaction co-ordinator is down, then another TC will
|
|
automatically take over the work.)
|
|
|
|
Every storage node has an ACC and a TUP which store
|
|
the indexes and data portions of the database table fragment.
|
|
Even though one TC is responsible for the transaction,
|
|
several ACCs and TUPs on other storage nodes might be involved in the
|
|
execution of the transaction.
|
|
|
|
|
|
@section secNdbKernelConnection Selecting a Transaction Co-ordinator
|
|
|
|
The default method is to select the transaction co-ordinator (TC) determined to be
|
|
the "closest" storage node, using a heuristic for proximity based on
|
|
the type of transporter connection. In order of closest to most distant, these are
|
|
- SCI
|
|
- SHM
|
|
- TCP/IP (localhost)
|
|
- TCP/IP (remote host)
|
|
If there are several connections available with the same proximity, they will each be
|
|
selected in a round robin fashion for every transaction. Optionally
|
|
one may set the method for TC selection to round-robin mode, where each new set of
|
|
transactions is placed on the next DB node. The pool of connections from which this
|
|
selection is made consists of all available connections.
|
|
|
|
As noted previously, the application programmer can provide hints to the NDB API as to
|
|
which transaction co-ordinator it should use. This is done by
|
|
providing a <em>table</em> and <em>partition key</em>
|
|
(usually the primary key).
|
|
By using the primary key as the partition key,
|
|
the transaction will be placed on the node where the primary replica
|
|
of that record resides.
|
|
Note that this is only a hint; the system can be
|
|
reconfigured at any time, in which case the NDB API will choose a transaction
|
|
co-ordinator without using the hint.
|
|
For more information, see NdbDictionary::Column::getPartitionKey() and
|
|
Ndb::startTransaction(). The application programmer can specify
|
|
the partition key from SQL by using the construct,
|
|
<code>CREATE TABLE ... ENGINE=NDB PARTITION BY KEY (<var>attribute-list</var>);</code>.
|
|
|
|
|
|
@section secRecordStruct NDB Record Structure
|
|
The NDB Cluster engine used by MySQL Cluster is a relational database engine
|
|
storing records in tables just as with any other RDBMS.
|
|
Table rows represent records as tuples of relational data.
|
|
When a new table is created, its attribute schema is specified for the table as a whole,
|
|
and thus each record of the table has the same structure. Again, this is typical
|
|
of relational databases, and NDB is no different in this regard.
|
|
|
|
|
|
@subsection secKeys Primary Keys
|
|
Each record has from 1 up to 32 attributes which belong
|
|
to the primary key of the table.
|
|
|
|
@section secTrans Transactions
|
|
|
|
Transactions are committed first to main memory,
|
|
and then to disk after a global checkpoint (GCP) is issued.
|
|
Since all data is (in most NDB Cluster configurations)
|
|
synchronously replicated and stored on multiple NDB nodes,
|
|
the system can still handle processor failures without loss
|
|
of data.
|
|
However, in the case of a system failure (e.g. the whole system goes down),
|
|
then all (committed or not) transactions occurring since the latest GCP are lost.
|
|
|
|
|
|
@subsection secConcur Concurrency Control
|
|
NDB Cluster uses pessimistic concurrency control based on locking.
|
|
If a requested lock (implicit and depending on database operation)
|
|
cannot be attained within a specified time,
|
|
then a timeout error occurs.
|
|
|
|
Concurrent transactions as requested by parallel application programs and
|
|
thread-based applications can sometimes deadlock when they try to access
|
|
the same information simultaneously.
|
|
Thus, applications need to be written in a manner so that timeout errors
|
|
occurring due to such deadlocks are handled gracefully. This generally
|
|
means that the transaction encountering a timeout should be rolled back
|
|
and restarted.
|
|
|
|
|
|
@section secHint Hints and Performance
|
|
|
|
Placing the transaction co-ordinator in close proximity
|
|
to the actual data used in the transaction can in many cases
|
|
improve performance significantly. This is particularly true for
|
|
systems using TCP/IP. For example, a Solaris system using a single 500 MHz processor
|
|
has a cost model for TCP/IP communication which can be represented by the formula
|
|
|
|
<code>[30 microseconds] + ([100 nanoseconds] * [<var>number of bytes</var>])</code>
|
|
|
|
This means that if we can ensure that we use "popular" links we increase
|
|
buffering and thus drastically reduce the communication cost.
|
|
The same system using SCI has a different cost model:
|
|
|
|
<code>[5 microseconds] + ([10 nanoseconds] * [<var>number of bytes</var>])</code>
|
|
|
|
Thus, the efficiency of an SCI system is much less dependent on selection of
|
|
transaction co-ordinators.
|
|
Typically, TCP/IP systems spend 30-60% of their working time on communication,
|
|
whereas for SCI systems this figure is closer to 5-10%.
|
|
Thus, employing SCI for data transport means that less care from the NDB API
|
|
programmer is required and greater scalability can be achieved, even for
|
|
applications using data from many different parts of the database.
|
|
|
|
A simple example is an application that uses many simple updates where
|
|
a transaction needs to update one record.
|
|
This record has a 32 bit primary key,
|
|
which is also the partition key.
|
|
Then the keyData will be the address of the integer
|
|
of the primary key and keyLen will be 4.
|
|
*/
|
|
|
|
#ifndef DOXYGEN_SHOULD_SKIP_INTERNAL
|
|
/**
|
|
(A transaction's execution can also be divided into three
|
|
steps: prepare, send, and poll. This allows us to perform asynchronous
|
|
transactions. More about this later.)
|
|
*/
|
|
#endif
|
|
#ifndef DOXYGEN_SHOULD_SKIP_INTERNAL
|
|
/**
|
|
Another way to execute several parallel transactions is to use
|
|
asynchronous transactions.
|
|
*/
|
|
#endif
|
|
#ifndef DOXYGEN_SHOULD_SKIP_INTERNAL
|
|
/**
|
|
Operations are of two different kinds:
|
|
-# standard operations, and
|
|
-# interpreted program operations.
|
|
*/
|
|
#endif
|
|
#ifndef DOXYGEN_SHOULD_SKIP_INTERNAL
|
|
/**
|
|
<h3>Interpreted Program Operations</h3>
|
|
The following types of interpreted program operations exist:
|
|
-# NdbOperation::interpretedUpdateTuple :
|
|
updates a tuple using an interpreted program
|
|
-# NdbOperation::interpretedDeleteTuple :
|
|
delete a tuple using an interpreted program
|
|
|
|
The operations interpretedUpdateTuple and interpretedDeleteTuple both
|
|
work using the unique tuple key.
|
|
|
|
These <em>interpreted programs</em>
|
|
make it possible to perform computations
|
|
inside the NDB Cluster Kernel instead of in the application
|
|
program.
|
|
This is sometimes very effective, since no intermediate results
|
|
are sent to the application, only the final result.
|
|
|
|
|
|
<h3>Interpreted Update and Delete</h3>
|
|
|
|
Operations for interpreted updates and deletes must follow a
|
|
certain order when defining operations on a tuple.
|
|
As for read and write operations,
|
|
one must first define the operation type and then the search key.
|
|
-# The first step is to define the initial readings.
|
|
In this phase it is only allowed to use the
|
|
NdbOperation::getValue method.
|
|
This part might be empty.
|
|
-# The second step is to define the interpreted part.
|
|
The methods supported are the methods listed below except
|
|
NdbOperation::def_subroutine and NdbOperation::ret_sub
|
|
which can only be used in a subroutine.
|
|
NdbOperation::incValue and NdbOperation::subValue
|
|
increment and decrement attributes
|
|
(currently only unsigned integers supported).
|
|
This part can also be empty since interpreted updates
|
|
can be used for reading and updating the same tuple.
|
|
<p>
|
|
Even though getValue and setValue are not really interpreted
|
|
program instructions, it is still allowed to use them as
|
|
the last instruction of the program.
|
|
(If a getValue or setValue is found when an interpret_exit_ok
|
|
could have been issued then the interpreted_exit_ok
|
|
will be inserted.
|
|
A interpret_exit_ok should be viewed as a jump to the first
|
|
instruction after the interpreted instructions.)
|
|
-# The third step is to define all updates without any
|
|
interpreted program instructions.
|
|
Here a set of NdbOperation::setValue methods are called.
|
|
There might be zero such calls.
|
|
-# The fourth step is the final readings.
|
|
The initial readings reads the initial value of attributes
|
|
and the final readings reads them after their updates.
|
|
There might be zero NdbOperation::getValue calls.
|
|
-# The fifth step is possible subroutine definitions using
|
|
NdbOperation::def_subroutine and NdbOperation::ret_sub.
|
|
*/
|
|
#endif
|
|
#ifndef DOXYGEN_SHOULD_SKIP_INTERNAL
|
|
/**
|
|
<h3>Interpreted Programs</h3>
|
|
Interpretation programs are executed in a
|
|
register-based virtual machine.
|
|
The virtual machine has eight 64 bit registers numbered 0-7.
|
|
Each register contains type information which is used both
|
|
for type conversion and for type checking.
|
|
|
|
@note Arrays are currently <b>not</b> supported in the virtual machine.
|
|
Currently only unsigned integers are supported and of size
|
|
maximum 64 bits.
|
|
|
|
All errors in the interpretation program will cause a
|
|
transaction abort, but will not affect any other transactions.
|
|
|
|
The following are legal interpreted program instructions:
|
|
-# incValue : Add to an attribute
|
|
-# subValue : Subtract from an attribute
|
|
-# def_label : Define a label in the interpreted program
|
|
-# add_reg : Add two registers
|
|
-# sub_reg : Subtract one register from another
|
|
-# load_const_u32 : Load an unsigned 32 bit value into a register
|
|
-# load_const_u64 : Load an unsigned 64 bit value into a register
|
|
-# load_const_null : Load a NULL value into a register
|
|
-# read_attr : Read attribute value into a register
|
|
-# write_attr : Write a register value into an attribute
|
|
-# branch_ge : Compares registers and possibly jumps to specified label
|
|
-# branch_gt : Compares registers and possibly jumps to specified label
|
|
-# branch_le : Compares registers and possibly jumps to specified label
|
|
-# branch_lt : Compares registers and possibly jumps to specified label
|
|
-# branch_eq : Compares registers and possibly jumps to specified label
|
|
-# branch_ne : Compares registers and possibly jumps to specified label
|
|
-# branch_ne_null : Jumps if register does not contain NULL value
|
|
-# branch_eq_null : Jumps if register contains NULL value
|
|
-# branch_label : Unconditional jump to label
|
|
-# interpret_exit_ok : Exit interpreted program
|
|
(approving tuple if used in scan)
|
|
-# interpret_exit_nok : Exit interpreted program
|
|
(disqualifying tuple if used in scan)
|
|
|
|
There are also three instructions for subroutines, which
|
|
are described in the next section.
|
|
|
|
@subsection subsubSub Interpreted Programs: Subroutines
|
|
|
|
The following are legal interpreted program instructions for
|
|
subroutines:
|
|
-# NdbOperation::def_subroutine :
|
|
Defines start of subroutine in interpreted program code
|
|
-# NdbOperation::call_sub :
|
|
Calls a subroutine
|
|
-# NdbOperation::ret_sub :
|
|
Return from subroutine
|
|
|
|
The virtual machine executes subroutines using a stack for
|
|
its operation.
|
|
The stack allows for up to 24 subroutine calls in succession.
|
|
Deeper subroutine nesting will cause an abort of the transaction.
|
|
|
|
All subroutines starts with the instruction
|
|
NdbOperation::def_subroutine and ends with the instruction
|
|
NdbOperation::ret_sub.
|
|
If it is necessary to return earlier in the subroutine
|
|
it has to be done using a branch_label instruction
|
|
to a label defined right before the
|
|
NdbOperation::ret_sub instruction.
|
|
|
|
@note The subroutines are automatically numbered starting with 0.
|
|
The parameter used by NdbOperation::def_subroutine
|
|
should match the automatic numbering to make it easier to
|
|
debug the interpreted program.
|
|
*/
|
|
#endif
|
|
|
|
#ifndef DOXYGEN_SHOULD_SKIP_INTERNAL
|
|
/**
|
|
@section secAsync Asynchronous Transactions
|
|
The asynchronous interface is used to increase the speed of
|
|
transaction executing by better utilizing the connection
|
|
between the application and the NDB Kernel.
|
|
The interface is used to send many transactions
|
|
at the same time to the NDB kernel.
|
|
This is often much more efficient than using synchronous transactions.
|
|
The main reason for using this method is to ensure that
|
|
Sending many transactions at the same time ensures that bigger
|
|
chunks of data are sent when actually sending and thus decreasing
|
|
the operating system overhead.
|
|
|
|
The synchronous call to NdbTransaction::execute
|
|
normally performs three main steps:<br>
|
|
-# <b>Prepare</b>
|
|
Check transaction status
|
|
- if problems, abort the transaction
|
|
- if ok, proceed
|
|
-# <b>Send</b>
|
|
Send the defined operations since last execute
|
|
or since start of transaction.
|
|
-# <b>Poll</b>
|
|
Wait for response from NDB kernel.
|
|
|
|
The asynchronous method NdbTransaction::executeAsynchPrepare
|
|
only perform step 1.
|
|
(The abort part in step 1 is only prepared for. The actual
|
|
aborting of the transaction is performed in a later step.)
|
|
|
|
Asynchronous transactions are defined and executed
|
|
in the following way.
|
|
-# Start (create) transactions (same way as for the
|
|
synchronous transactions)
|
|
-# Add and define operations (also as in the synchronous case)
|
|
-# <b>Prepare</b> transactions
|
|
(using NdbTransaction::executeAsynchPrepare or
|
|
NdbTransaction::executeAsynch)
|
|
-# <b>Send</b> transactions to NDB Kernel
|
|
(using Ndb::sendPreparedTransactions,
|
|
NdbTransaction::executeAsynch, or Ndb::sendPollNdb)
|
|
-# <b>Poll</b> NDB kernel to find completed transactions
|
|
(using Ndb::pollNdb or Ndb::sendPollNdb)
|
|
-# Close transactions (same way as for the synchronous transactions)
|
|
|
|
See example program in section @ref ndbapi_example2.cpp.
|
|
|
|
This prepare-send-poll protocol actually exists in four variants:
|
|
- (Prepare-Send-Poll). This is the one-step variant provided
|
|
by synchronous transactions.
|
|
- (Prepare-Send)-Poll. This is the two-step variant using
|
|
NdbTransaction::executeAsynch and Ndb::pollNdb.
|
|
- Prepare-(Send-Poll). This is the two-step variant using
|
|
NdbTransaction::executeAsynchPrepare and Ndb::sendPollNdb.
|
|
- Prepare-Send-Poll. This is the three-step variant using
|
|
NdbTransaction::executeAsynchPrepare, Ndb::sendPreparedTransactions, and
|
|
Ndb::pollNdb.
|
|
|
|
Transactions first has to be prepared by using method
|
|
NdbTransaction::executeAsynchPrepare or NdbTransaction::executeAsynch.
|
|
The difference between these is that
|
|
NdbTransaction::executeAsynch also sends the transaction to
|
|
the NDB kernel.
|
|
One of the arguments to these methods is a callback method.
|
|
The callback method is executed during polling (item 5 above).
|
|
|
|
Note that NdbTransaction::executeAsynchPrepare does not
|
|
send the transaction to the NDB kernel. When using
|
|
NdbTransaction::executeAsynchPrepare, you either have to call
|
|
Ndb::sendPreparedTransactions or Ndb::sendPollNdb to send the
|
|
database operations.
|
|
(Ndb::sendPollNdb also polls Ndb for completed transactions.)
|
|
|
|
The methods Ndb::pollNdb and Ndb::sendPollNdb checks if any
|
|
sent transactions are completed. The method Ndb::sendPollNdb
|
|
also send all prepared transactions before polling NDB.
|
|
Transactions still in the definition phase (i.e. items 1-3 above,
|
|
transactions which has not yet been sent to the NDB kernel) are not
|
|
affected by poll-calls.
|
|
The poll method invoked (either Ndb::pollNdb or Ndb::sendPollNdb)
|
|
will return when:
|
|
-# at least 'minNoOfEventsToWakeup' of the transactions
|
|
are finished processing, and
|
|
-# all of these transactions have executed their
|
|
callback methods.
|
|
|
|
The poll method returns the number of transactions that
|
|
have finished processing and executed their callback methods.
|
|
|
|
@note When an asynchronous transaction has been started and sent to
|
|
the NDB kernel, it is not allowed to execute any methods on
|
|
objects belonging to this transaction until the transaction
|
|
callback method have been executed.
|
|
(The transaction is stated and sent by either
|
|
NdbTransaction::executeAsynch or through the combination of
|
|
NdbTransaction::executeAsynchPrepare and either
|
|
Ndb::sendPreparedTransactions or Ndb::sendPollNdb).
|
|
|
|
More about how transactions are sent the NDB Kernel is
|
|
available in section @ref secAdapt.
|
|
*/
|
|
#endif
|
|
|
|
|
|
/**
|
|
|
|
Put this back when real array ops are supported
|
|
i.e. get/setValue("kalle[3]");
|
|
|
|
@subsection secArrays Array Attributes
|
|
A table attribute in NDB Cluster can be of type <var>Array</var>,
|
|
meaning that the attribute consists of an ordered sequence of
|
|
elements. In such cases, <var>attribute size</var> is the size
|
|
(expressed in bits) of any one element making up the array; the
|
|
<var>array size</var> is the number of elements in the array.
|
|
|
|
*/
|
|
|
|
#ifndef Ndb_H
|
|
#define Ndb_H
|
|
|
|
#include <ndb_types.h>
|
|
#include <ndbapi_limits.h>
|
|
#include <ndb_cluster_connection.hpp>
|
|
#include <NdbError.hpp>
|
|
#include <NdbDictionary.hpp>
|
|
|
|
class NdbObjectIdMap;
|
|
class NdbOperation;
|
|
class NdbEventOperationImpl;
|
|
class NdbScanOperation;
|
|
class NdbIndexScanOperation;
|
|
class NdbIndexOperation;
|
|
class NdbTransaction;
|
|
class NdbApiSignal;
|
|
class NdbRecAttr;
|
|
class NdbLabel;
|
|
class NdbBranch;
|
|
class NdbSubroutine;
|
|
class NdbCall;
|
|
class Table;
|
|
class BaseString;
|
|
class NdbEventOperation;
|
|
class NdbBlob;
|
|
class NdbReceiver;
|
|
class TransporterFacade;
|
|
class PollGuard;
|
|
class Ndb_local_table_info;
|
|
template <class T> struct Ndb_free_list_t;
|
|
|
|
typedef void (* NdbEventCallback)(NdbEventOperation*, Ndb*, void*);
|
|
|
|
#define WAITFOR_RESPONSE_TIMEOUT 120000 // Milliseconds
|
|
|
|
#define NDB_SYSTEM_DATABASE "sys"
|
|
#define NDB_SYSTEM_SCHEMA "def"
|
|
|
|
/**
|
|
* @class Ndb
|
|
* @brief Represents the NDB kernel and is the main class of the NDB API.
|
|
*
|
|
* Always start your application program by creating an Ndb object.
|
|
* By using several Ndb objects it is possible to design
|
|
* a multi-threaded application, but note that Ndb objects
|
|
* cannot be shared by several threads.
|
|
* Different threads should use different Ndb objects.
|
|
* A thread might however use multiple Ndb objects.
|
|
* Currently there is a limit of maximum 128 Ndb objects
|
|
* per application process.
|
|
*
|
|
* @note It is not allowed to call methods in the NDB API
|
|
* on the same Ndb object in different threads
|
|
* simultaneously (without special handling of the
|
|
* Ndb object).
|
|
*
|
|
* @note The Ndb object is multi-thread safe in the following manner.
|
|
* Each Ndb object can ONLY be handled in one thread.
|
|
* If an Ndb object is handed over to another thread then the
|
|
* application must ensure that a memory barrier is used to
|
|
* ensure that the new thread see all updates performed by
|
|
* the previous thread.
|
|
* Semaphores, mutexes and so forth are easy ways of issuing memory
|
|
* barriers without having to bother about the memory barrier concept.
|
|
*
|
|
*/
|
|
|
|
#ifndef DOXYGEN_SHOULD_SKIP_INTERNAL
|
|
// to be documented later
|
|
/*
|
|
* If one Ndb object is used to handle parallel transactions through the
|
|
* asynchronous programming interface, please read the notes regarding
|
|
* asynchronous transactions (Section @ref secAsync).
|
|
* The asynchronous interface provides much higher performance
|
|
* in some situations, but is more complicated for the application designer.
|
|
*
|
|
* @note Each Ndb object should either use the methods for
|
|
* asynchronous transaction or the methods for
|
|
* synchronous transactions but not both.
|
|
*/
|
|
#endif
|
|
|
|
class Ndb
|
|
{
|
|
#ifndef DOXYGEN_SHOULD_SKIP_INTERNAL
|
|
friend class NdbReceiver;
|
|
friend class NdbOperation;
|
|
friend class NdbEventOperationImpl;
|
|
friend class NdbEventBuffer;
|
|
friend class NdbTransaction;
|
|
friend class Table;
|
|
friend class NdbApiSignal;
|
|
friend class NdbIndexOperation;
|
|
friend class NdbScanOperation;
|
|
friend class NdbIndexScanOperation;
|
|
friend class NdbDictionaryImpl;
|
|
friend class NdbDictInterface;
|
|
friend class NdbBlob;
|
|
friend class NdbImpl;
|
|
#endif
|
|
|
|
public:
|
|
/**
|
|
* @name General
|
|
* @{
|
|
*/
|
|
/**
|
|
* The Ndb object represents a connection to a database.
|
|
*
|
|
* @note The init() method must be called before the Ndb object may actually be used.
|
|
*
|
|
* @param ndb_cluster_connection is a connection to the cluster containing
|
|
* the database to be used
|
|
* @param aCatalogName is the name of the catalog to be used.
|
|
* @note The catalog name provides a namespace for the tables and
|
|
* indexes created in any connection from the Ndb object.
|
|
* @param aSchemaName is the name of the schema you
|
|
* want to use.
|
|
* @note The schema name provides an additional namespace
|
|
* for the tables and indexes created in a given catalog.
|
|
*/
|
|
Ndb(Ndb_cluster_connection *ndb_cluster_connection,
|
|
const char* aCatalogName = "", const char* aSchemaName = "def");
|
|
|
|
~Ndb();
|
|
|
|
#ifndef DOXYGEN_SHOULD_SKIP_INTERNAL
|
|
/**
|
|
* The current ndb_cluster_connection get_ndb_cluster_connection.
|
|
*
|
|
* @return the current connection
|
|
*/
|
|
Ndb_cluster_connection& get_ndb_cluster_connection();
|
|
#endif
|
|
|
|
#ifndef DOXYGEN_SHOULD_SKIP_INTERNAL
|
|
/**
|
|
* The current catalog name can be fetched by getCatalogName.
|
|
*
|
|
* @return the current catalog name
|
|
*/
|
|
const char * getCatalogName() const;
|
|
|
|
/**
|
|
* The current catalog name can be set by setCatalogName.
|
|
*
|
|
* @param aCatalogName is the new name of the current catalog
|
|
*/
|
|
void setCatalogName(const char * aCatalogName);
|
|
|
|
/**
|
|
* The current schema name can be fetched by getSchemaName.
|
|
*
|
|
* @return the current schema name
|
|
*/
|
|
const char * getSchemaName() const;
|
|
|
|
/**
|
|
* The current schema name can be set by setSchemaName.
|
|
*
|
|
* @param aSchemaName is the new name of the current schema
|
|
*/
|
|
void setSchemaName(const char * aSchemaName);
|
|
#endif
|
|
|
|
/**
|
|
* The current database name can be fetched by getDatabaseName.
|
|
*
|
|
* @return the current database name
|
|
*/
|
|
const char * getDatabaseName() const;
|
|
|
|
/**
|
|
* The current database name can be set by setDatabaseName.
|
|
*
|
|
* @param aDatabaseName is the new name of the current database
|
|
*/
|
|
void setDatabaseName(const char * aDatabaseName);
|
|
|
|
/**
|
|
* The current database schema name can be fetched by getDatabaseSchemaName.
|
|
*
|
|
* @return the current database schema name
|
|
*/
|
|
const char * getDatabaseSchemaName() const;
|
|
|
|
/**
|
|
* The current database schema name can be set by setDatabaseSchemaName.
|
|
*
|
|
* @param aDatabaseSchemaName is the new name of the current database schema
|
|
*/
|
|
void setDatabaseSchemaName(const char * aDatabaseSchemaName);
|
|
|
|
#ifndef DOXYGEN_SHOULD_SKIP_INTERNAL
|
|
/** Set database and schema name to match previously retrieved table
|
|
*
|
|
* Returns non-zero if table internal name does not contain
|
|
* non-empty database and schema names
|
|
*/
|
|
int setDatabaseAndSchemaName(const NdbDictionary::Table* t);
|
|
#endif
|
|
|
|
/**
|
|
* Initializes the Ndb object
|
|
*
|
|
* @param maxNoOfTransactions
|
|
* Maximum number of parallel
|
|
* NdbTransaction objects that can be handled by the Ndb object.
|
|
* Maximum value is 1024.
|
|
*
|
|
* @note each scan or index scan operation uses one extra
|
|
* NdbTransaction object
|
|
*
|
|
* @return 0 if successful, -1 otherwise.
|
|
*/
|
|
int init(int maxNoOfTransactions = 4);
|
|
|
|
#ifndef DOXYGEN_SHOULD_SKIP_DEPRECATED
|
|
/**
|
|
* Wait for Ndb object to successfully set-up connections to
|
|
* the NDB kernel.
|
|
* Starting to use the Ndb object without using this method
|
|
* gives unspecified behavior.
|
|
*
|
|
* @param timeout The maximum time we will wait for
|
|
* the initiation process to finish.
|
|
* Timeout is expressed in seconds.
|
|
* @return 0: Ndb is ready and timeout has not occurred.<br>
|
|
* -1: Timeout has expired
|
|
*/
|
|
int waitUntilReady(int timeout = 60);
|
|
#endif
|
|
|
|
/** @} *********************************************************************/
|
|
|
|
/**
|
|
* @name Meta Information
|
|
* @{
|
|
*/
|
|
|
|
/**
|
|
* Get an object for retrieving or manipulating database schema information
|
|
*
|
|
* @note this object operates outside any transaction
|
|
*
|
|
* @return Object containing meta information about all tables
|
|
* in NDB Cluster.
|
|
*/
|
|
class NdbDictionary::Dictionary* getDictionary() const;
|
|
|
|
|
|
/** @} *********************************************************************/
|
|
|
|
/**
|
|
* @name Event subscriptions
|
|
* @{
|
|
*/
|
|
|
|
/**
|
|
* Create a subcription to an event defined in the database
|
|
*
|
|
* @param eventName
|
|
* unique identifier of the event
|
|
*
|
|
* @return Object representing an event, NULL on failure
|
|
*/
|
|
NdbEventOperation* createEventOperation(const char* eventName);
|
|
/**
|
|
* Drop a subscription to an event
|
|
*
|
|
* @param eventOp
|
|
* Event operation
|
|
*
|
|
* @return 0 on success
|
|
*/
|
|
int dropEventOperation(NdbEventOperation* eventOp);
|
|
|
|
/**
|
|
* Wait for an event to occur. Will return as soon as an event
|
|
* is detected on any of the created events.
|
|
*
|
|
* @param aMillisecondNumber
|
|
* maximum time to wait
|
|
*
|
|
* @return > 0 if events available, 0 if no events available, < 0 on failure
|
|
*/
|
|
int pollEvents(int aMillisecondNumber, Uint64 *latestGCI= 0);
|
|
|
|
/**
|
|
* Returns an event operation that has data after a pollEvents
|
|
*
|
|
* @return an event operations that has data, NULL if no events left with data.
|
|
*/
|
|
NdbEventOperation *nextEvent();
|
|
|
|
/**
|
|
* Iterate over distinct event operations which are part of current
|
|
* GCI. Valid after nextEvent. Used to get summary information for
|
|
* the epoch (e.g. list of all tables) before processing event data.
|
|
*
|
|
* Set *iter=0 to start. Returns NULL when no more. If event_types
|
|
* is not NULL, it returns bitmask of received event types.
|
|
*/
|
|
const NdbEventOperation*
|
|
getGCIEventOperations(Uint32* iter, Uint32* event_types);
|
|
|
|
|
|
#ifndef DOXYGEN_SHOULD_SKIP_INTERNAL
|
|
int flushIncompleteEvents(Uint64 gci);
|
|
NdbEventOperation *getEventOperation(NdbEventOperation* eventOp= 0);
|
|
Uint64 getLatestGCI();
|
|
void forceGCP();
|
|
void setReportThreshEventGCISlip(unsigned thresh);
|
|
void setReportThreshEventFreeMem(unsigned thresh);
|
|
#endif
|
|
|
|
/** @} *********************************************************************/
|
|
|
|
/**
|
|
* @name Starting and Closing Transactions
|
|
* @{
|
|
*/
|
|
|
|
/**
|
|
* Start a transaction
|
|
*
|
|
* @note When the transaction is completed it must be closed using
|
|
* Ndb::closeTransaction or NdbTransaction::close.
|
|
* The transaction must be closed independent of its outcome, i.e.
|
|
* even if there is an error.
|
|
*
|
|
* @param table Pointer to table object used for deciding
|
|
* which node to run the Transaction Coordinator on
|
|
* @param keyData Pointer to partition key corresponding to
|
|
* <var>table</var>
|
|
* @param keyLen Length of partition key expressed in bytes
|
|
*
|
|
* @return NdbTransaction object, or NULL on failure.
|
|
*/
|
|
NdbTransaction* startTransaction(const NdbDictionary::Table *table= 0,
|
|
const char *keyData = 0,
|
|
Uint32 keyLen = 0);
|
|
|
|
/**
|
|
* Close a transaction.
|
|
*
|
|
* @note should be called after the transaction has completed, irrespective
|
|
* of success or failure
|
|
*/
|
|
#ifndef DOXYGEN_SHOULD_SKIP_INTERNAL
|
|
/**
|
|
* @note It is not allowed to call Ndb::closeTransaction after sending the
|
|
* transaction asynchronously with either
|
|
* Ndb::sendPreparedTransactions or
|
|
* Ndb::sendPollNdb before the callback method has been called.
|
|
* (The application should keep track of the number of
|
|
* outstanding transactions and wait until all of them
|
|
* has completed before calling Ndb::closeTransaction).
|
|
* If the transaction is not committed it will be aborted.
|
|
*/
|
|
#endif
|
|
void closeTransaction(NdbTransaction*);
|
|
|
|
/** @} *********************************************************************/
|
|
|
|
#ifndef DOXYGEN_SHOULD_SKIP_INTERNAL
|
|
// to be documented later
|
|
/**
|
|
* @name Asynchronous Transactions
|
|
* @{
|
|
*/
|
|
|
|
/**
|
|
* Wait for prepared transactions.
|
|
* Will return as soon as at least 'minNoOfEventsToWakeUp'
|
|
* of them have completed, or the maximum time given as timeout has passed.
|
|
*
|
|
* @param aMillisecondNumber
|
|
* Maximum time to wait for transactions to complete. Polling
|
|
* without wait is achieved by setting the timer to zero.
|
|
* Time is expressed in milliseconds.
|
|
* @param minNoOfEventsToWakeup Minimum number of transactions
|
|
* which has to wake up before the poll-call will return.
|
|
* If minNoOfEventsToWakeup is
|
|
* set to a value larger than 1 then this is the minimum
|
|
* number of transactions that need to complete before the
|
|
* poll will return.
|
|
* Setting it to zero means that one should wait for all
|
|
* outstanding transactions to return before waking up.
|
|
* @return Number of transactions polled.
|
|
*/
|
|
int pollNdb(int aMillisecondNumber = WAITFOR_RESPONSE_TIMEOUT,
|
|
int minNoOfEventsToWakeup = 1);
|
|
|
|
/**
|
|
* This send method will send all prepared database operations.
|
|
* The default method is to do it non-force and instead
|
|
* use the adaptive algorithm. (See Section @ref secAdapt.)
|
|
* The second option is to force the sending and
|
|
* finally there is the third alternative which is
|
|
* also non-force but also making sure that the
|
|
* adaptive algorithm do not notice the send.
|
|
* In this case the sending will be performed on a
|
|
* cyclical 10 millisecond event.
|
|
*
|
|
* @param forceSend When operations should be sent to NDB Kernel.
|
|
* (See @ref secAdapt.)
|
|
* - 0: non-force, adaptive algorithm notices it (default);
|
|
* - 1: force send, adaptive algorithm notices it;
|
|
* - 2: non-force, adaptive algorithm do not notice the send.
|
|
*/
|
|
void sendPreparedTransactions(int forceSend = 0);
|
|
|
|
/**
|
|
* This is a send-poll variant that first calls
|
|
* Ndb::sendPreparedTransactions and then Ndb::pollNdb.
|
|
* It is however somewhat faster than calling the methods
|
|
* separately, since some mutex-operations are avoided.
|
|
* See documentation of Ndb::pollNdb and Ndb::sendPreparedTransactions
|
|
* for more details.
|
|
*
|
|
* @param aMillisecondNumber Timeout specifier
|
|
* Polling without wait is achieved by setting the
|
|
* millisecond timer to zero.
|
|
* @param minNoOfEventsToWakeup Minimum number of transactions
|
|
* which has to wake up before the poll-call will return.
|
|
* If minNoOfEventsToWakeup is
|
|
* set to a value larger than 1 then this is the minimum
|
|
* number of transactions that need to complete before the
|
|
* poll-call will return.
|
|
* Setting it to zero means that one should wait for all
|
|
* outstanding transactions to return before waking up.
|
|
* @param forceSend When operations should be sent to NDB Kernel.
|
|
* (See @ref secAdapt.)
|
|
* - 0: non-force, adaptive algorithm notices it (default);
|
|
* - 1: force send, adaptive algorithm notices it;
|
|
* - 2: non-force, adaptive algorithm does not notice the send.
|
|
* @return Number of transactions polled.
|
|
*/
|
|
int sendPollNdb(int aMillisecondNumber = WAITFOR_RESPONSE_TIMEOUT,
|
|
int minNoOfEventsToWakeup = 1,
|
|
int forceSend = 0);
|
|
/** @} *********************************************************************/
|
|
#endif
|
|
|
|
/**
|
|
* @name Error Handling
|
|
* @{
|
|
*/
|
|
|
|
/**
|
|
* Get the NdbError object
|
|
*
|
|
* @note The NdbError object is valid until a new NDB API method is called.
|
|
*/
|
|
const NdbError & getNdbError() const;
|
|
|
|
/**
|
|
* Get a NdbError object for a specific error code
|
|
*
|
|
* The NdbError object is valid until you call a new NDB API method.
|
|
*/
|
|
const NdbError & getNdbError(int errorCode);
|
|
|
|
|
|
/** @} *********************************************************************/
|
|
|
|
#ifndef DOXYGEN_SHOULD_SKIP_INTERNAL
|
|
/**
|
|
* Get the application node identity.
|
|
*
|
|
* @return Node id of this application.
|
|
*/
|
|
int getNodeId();
|
|
|
|
bool usingFullyQualifiedNames();
|
|
|
|
/**
|
|
* Different types of tampering with the NDB Cluster.
|
|
* <b>Only for debugging purposes only.</b>
|
|
*/
|
|
enum TamperType {
|
|
LockGlbChp = 1, ///< Lock GCP
|
|
UnlockGlbChp, ///< Unlock GCP
|
|
CrashNode, ///< Crash an NDB node
|
|
ReadRestartGCI, ///< Request the restart GCI id from NDB Cluster
|
|
InsertError ///< Execute an error in NDB Cluster
|
|
///< (may crash system)
|
|
};
|
|
|
|
/**
|
|
* For testing purposes it is possible to tamper with the NDB Cluster
|
|
* (i.e. send a special signal to DBDIH, the NDB distribution handler).
|
|
* <b>This feature should only used for debugging purposes.</b>
|
|
* In a release versions of NDB Cluster,
|
|
* this call always return -1 and does nothing.
|
|
*
|
|
* @param aAction Action to be taken according to TamperType above
|
|
*
|
|
* @param aNode Which node the action will be taken
|
|
* -1: Master DIH.
|
|
* 0-16: Nodnumber.
|
|
* @return -1 indicates error, other values have meaning dependent
|
|
* on type of tampering.
|
|
*/
|
|
int NdbTamper(TamperType aAction, int aNode);
|
|
|
|
/**
|
|
* Return a unique tuple id for a table. The id sequence is
|
|
* ascending but may contain gaps. Methods which have no
|
|
* TupleIdRange argument use NDB API dict cache. They may
|
|
* not be called from mysqld.
|
|
*
|
|
* @param aTableName table name
|
|
*
|
|
* @param cacheSize number of values to cache in this Ndb object
|
|
*
|
|
* @return 0 or -1 on error, and tupleId in out parameter
|
|
*/
|
|
struct TupleIdRange {
|
|
TupleIdRange() {}
|
|
Uint64 m_first_tuple_id;
|
|
Uint64 m_last_tuple_id;
|
|
void reset() {
|
|
m_first_tuple_id = ~(Uint64)0;
|
|
m_last_tuple_id = ~(Uint64)0;
|
|
};
|
|
};
|
|
|
|
int initAutoIncrement();
|
|
|
|
int getAutoIncrementValue(const char* aTableName,
|
|
Uint64 & tupleId, Uint32 cacheSize);
|
|
int getAutoIncrementValue(const NdbDictionary::Table * aTable,
|
|
Uint64 & tupleId, Uint32 cacheSize);
|
|
int getAutoIncrementValue(const NdbDictionary::Table * aTable,
|
|
TupleIdRange & range, Uint64 & tupleId,
|
|
Uint32 cacheSize);
|
|
int readAutoIncrementValue(const char* aTableName,
|
|
Uint64 & tupleId);
|
|
int readAutoIncrementValue(const NdbDictionary::Table * aTable,
|
|
Uint64 & tupleId);
|
|
int readAutoIncrementValue(const NdbDictionary::Table * aTable,
|
|
TupleIdRange & range, Uint64 & tupleId);
|
|
int setAutoIncrementValue(const char* aTableName,
|
|
Uint64 tupleId, bool increase);
|
|
int setAutoIncrementValue(const NdbDictionary::Table * aTable,
|
|
Uint64 tupleId, bool increase);
|
|
int setAutoIncrementValue(const NdbDictionary::Table * aTable,
|
|
TupleIdRange & range, Uint64 tupleId,
|
|
bool increase);
|
|
private:
|
|
int getTupleIdFromNdb(const NdbTableImpl* table,
|
|
TupleIdRange & range, Uint64 & tupleId,
|
|
Uint32 cacheSize);
|
|
int readTupleIdFromNdb(const NdbTableImpl* table,
|
|
TupleIdRange & range, Uint64 & tupleId);
|
|
int setTupleIdInNdb(const NdbTableImpl* table,
|
|
TupleIdRange & range, Uint64 tupleId, bool increase);
|
|
int opTupleIdOnNdb(const NdbTableImpl* table,
|
|
TupleIdRange & range, Uint64 & opValue, Uint32 op);
|
|
public:
|
|
|
|
/**
|
|
*/
|
|
NdbTransaction* hupp( NdbTransaction* );
|
|
Uint32 getReference() const { return theMyRef;}
|
|
|
|
struct Free_list_usage
|
|
{
|
|
const char * m_name;
|
|
Uint32 m_created;
|
|
Uint32 m_free;
|
|
Uint32 m_sizeof;
|
|
};
|
|
|
|
Free_list_usage * get_free_list_usage(Free_list_usage*);
|
|
#endif
|
|
|
|
|
|
|
|
/*****************************************************************************
|
|
* These are service routines used by the other classes in the NDBAPI.
|
|
****************************************************************************/
|
|
Uint32 get_cond_wait_index() { return cond_wait_index; }
|
|
void set_cond_wait_index(Uint32 index) { cond_wait_index = index; }
|
|
private:
|
|
Uint32 cond_wait_index;
|
|
Ndb *cond_signal_ndb;
|
|
void cond_signal();
|
|
|
|
void setup(Ndb_cluster_connection *ndb_cluster_connection,
|
|
const char* aCatalogName, const char* aSchemaName);
|
|
|
|
void connected(Uint32 block_reference);
|
|
void report_node_connected(Uint32 nodeId);
|
|
|
|
|
|
NdbTransaction* startTransactionLocal(Uint32 aPrio, Uint32 aFragmentId);
|
|
|
|
// Connect the connection object to the Database.
|
|
int NDB_connect(Uint32 tNode);
|
|
NdbTransaction* doConnect(Uint32 nodeId);
|
|
void doDisconnect();
|
|
|
|
NdbReceiver* getNdbScanRec();// Get a NdbScanReceiver from idle list
|
|
NdbLabel* getNdbLabel(); // Get a NdbLabel from idle list
|
|
NdbBranch* getNdbBranch(); // Get a NdbBranch from idle list
|
|
NdbSubroutine* getNdbSubroutine();// Get a NdbSubroutine from idle
|
|
NdbCall* getNdbCall(); // Get a NdbCall from idle list
|
|
NdbApiSignal* getSignal(); // Get an operation from idle list
|
|
NdbRecAttr* getRecAttr(); // Get a receeive attribute object from
|
|
// idle list of the Ndb object.
|
|
NdbOperation* getOperation(); // Get an operation from idle list
|
|
NdbIndexScanOperation* getScanOperation(); // Get a scan operation from idle
|
|
NdbIndexOperation* getIndexOperation();// Get an index operation from idle
|
|
|
|
NdbBlob* getNdbBlob();// Get a blob handle etc
|
|
|
|
void releaseSignal(NdbApiSignal* anApiSignal);
|
|
void releaseSignalsInList(NdbApiSignal** pList);
|
|
void releaseNdbScanRec(NdbReceiver* aNdbScanRec);
|
|
void releaseNdbLabel(NdbLabel* anNdbLabel);
|
|
void releaseNdbBranch(NdbBranch* anNdbBranch);
|
|
void releaseNdbSubroutine(NdbSubroutine* anNdbSubroutine);
|
|
void releaseNdbCall(NdbCall* anNdbCall);
|
|
void releaseRecAttr (NdbRecAttr* aRecAttr);
|
|
void releaseOperation(NdbOperation* anOperation);
|
|
void releaseScanOperation(NdbIndexScanOperation*);
|
|
void releaseNdbBlob(NdbBlob* aBlob);
|
|
|
|
void check_send_timeout();
|
|
void remove_sent_list(Uint32);
|
|
Uint32 insert_completed_list(NdbTransaction*);
|
|
Uint32 insert_sent_list(NdbTransaction*);
|
|
|
|
// Handle a received signal. Used by both
|
|
// synchronous and asynchronous interface
|
|
void handleReceivedSignal(NdbApiSignal* anApiSignal, struct LinearSectionPtr ptr[3]);
|
|
|
|
int sendRecSignal(Uint16 aNodeId,
|
|
Uint32 aWaitState,
|
|
NdbApiSignal* aSignal,
|
|
Uint32 nodeSequence,
|
|
Uint32 *ret_conn_seq= 0);
|
|
|
|
// Sets Restart GCI in Ndb object
|
|
void RestartGCI(int aRestartGCI);
|
|
|
|
// Get block number of this NDBAPI object
|
|
int getBlockNumber();
|
|
|
|
/****************************************************************************
|
|
* These are local service routines used by this class.
|
|
***************************************************************************/
|
|
|
|
int createConIdleList(int aNrOfCon);
|
|
int createOpIdleList( int nrOfOp );
|
|
|
|
void freeOperation(); // Free the first idle operation.
|
|
void freeScanOperation(); // Free the first idle scan operation.
|
|
void freeIndexOperation(); // Free the first idle index operation.
|
|
void freeNdbCon(); // Free the first idle connection.
|
|
void freeSignal(); // Free the first idle signal
|
|
void freeRecAttr(); // Free the first idle receive attr obj
|
|
void freeNdbLabel(); // Free the first idle NdbLabel obj
|
|
void freeNdbBranch();// Free the first idle NdbBranch obj
|
|
void freeNdbSubroutine();// Free the first idle NdbSubroutine obj
|
|
void freeNdbCall(); // Free the first idle NdbCall obj
|
|
void freeNdbScanRec(); // Free the first idle NdbScanRec obj
|
|
void freeNdbBlob(); // Free the first etc
|
|
|
|
NdbTransaction* getNdbCon(); // Get a connection from idle list
|
|
|
|
/**
|
|
* Get a connected NdbTransaction to nodeId
|
|
* Returns NULL if none found
|
|
*/
|
|
NdbTransaction* getConnectedNdbTransaction(Uint32 nodeId);
|
|
|
|
// Release and disconnect from DBTC a connection
|
|
// and seize it to theConIdleList
|
|
void releaseConnectToNdb (NdbTransaction*);
|
|
|
|
// Release a connection to idle list
|
|
void releaseNdbCon (NdbTransaction*);
|
|
|
|
int checkInitState(); // Check that we are initialized
|
|
void report_node_failure(Uint32 node_id); // Report Failed node
|
|
void report_node_failure_completed(Uint32 node_id); // Report Failed node(NF comp.)
|
|
|
|
void checkFailedNode(); // Check for failed nodes
|
|
|
|
int NDB_connect(); // Perform connect towards NDB Kernel
|
|
|
|
// Release arrays of NdbTransaction pointers
|
|
void releaseTransactionArrays();
|
|
|
|
Uint32 pollCompleted(NdbTransaction** aCopyArray);
|
|
void sendPrepTrans(int forceSend);
|
|
void reportCallback(NdbTransaction** aCopyArray, Uint32 aNoOfComplTrans);
|
|
int poll_trans(int milliSecs, int noOfEventsToWaitFor, PollGuard *pg);
|
|
void waitCompletedTransactions(int milliSecs, int noOfEventsToWaitFor,
|
|
PollGuard *pg);
|
|
void completedTransaction(NdbTransaction* aTransaction);
|
|
void completedScanTransaction(NdbTransaction* aTransaction);
|
|
|
|
void abortTransactionsAfterNodeFailure(Uint16 aNodeId);
|
|
|
|
static
|
|
const char * externalizeTableName(const char * internalTableName,
|
|
bool fullyQualifiedNames);
|
|
const char * externalizeTableName(const char * internalTableName);
|
|
const BaseString internalize_table_name(const char * external_name) const;
|
|
|
|
static
|
|
const char * externalizeIndexName(const char * internalIndexName,
|
|
bool fullyQualifiedNames);
|
|
const char * externalizeIndexName(const char * internalIndexName);
|
|
const BaseString old_internalize_index_name(const NdbTableImpl * table,
|
|
const char * external_name) const;
|
|
const BaseString internalize_index_name(const NdbTableImpl * table,
|
|
const char * external_name) const;
|
|
|
|
static
|
|
const BaseString getDatabaseFromInternalName(const char * internalName);
|
|
static
|
|
const BaseString getSchemaFromInternalName(const char * internalName);
|
|
|
|
void* int2void (Uint32 val);
|
|
NdbReceiver* void2rec (void* val);
|
|
NdbTransaction* void2con (void* val);
|
|
NdbOperation* void2rec_op (void* val);
|
|
NdbIndexOperation* void2rec_iop (void* val);
|
|
|
|
/******************************************************************************
|
|
* These are the private variables in this class.
|
|
*****************************************************************************/
|
|
NdbTransaction** thePreparedTransactionsArray;
|
|
NdbTransaction** theSentTransactionsArray;
|
|
NdbTransaction** theCompletedTransactionsArray;
|
|
|
|
Uint32 theNoOfPreparedTransactions;
|
|
Uint32 theNoOfSentTransactions;
|
|
Uint32 theNoOfCompletedTransactions;
|
|
Uint32 theRemainingStartTransactions;
|
|
Uint32 theMaxNoOfTransactions;
|
|
Uint32 theMinNoOfEventsToWakeUp;
|
|
|
|
Uint32 theNextConnectNode;
|
|
|
|
bool fullyQualifiedNames;
|
|
|
|
|
|
|
|
class NdbImpl * theImpl;
|
|
class NdbDictionaryImpl* theDictionary;
|
|
class NdbEventBuffer* theEventBuffer;
|
|
|
|
NdbTransaction* theTransactionList;
|
|
NdbTransaction** theConnectionArray;
|
|
|
|
Uint32 theMyRef; // My block reference
|
|
Uint32 theNode; // The node number of our node
|
|
|
|
Uint64 the_last_check_time;
|
|
Uint64 theFirstTransId;
|
|
// The tupleId is retrieved from DB
|
|
const NdbDictionary::Table *m_sys_tab_0;
|
|
|
|
Uint32 theRestartGCI; // the Restart GCI used by DIHNDBTAMPER
|
|
|
|
NdbError theError;
|
|
|
|
Int32 theNdbBlockNumber;
|
|
|
|
enum InitType {
|
|
NotConstructed,
|
|
NotInitialised,
|
|
StartingInit,
|
|
Initialised,
|
|
InitConfigError
|
|
} theInitState;
|
|
|
|
NdbApiSignal* theCommitAckSignal;
|
|
|
|
|
|
#ifdef POORMANSPURIFY
|
|
int cfreeSignals;
|
|
int cnewSignals;
|
|
int cgetSignals;
|
|
int creleaseSignals;
|
|
#endif
|
|
|
|
static void executeMessage(void*, NdbApiSignal *,
|
|
struct LinearSectionPtr ptr[3]);
|
|
static void statusMessage(void*, Uint32, bool, bool);
|
|
#ifdef VM_TRACE
|
|
void printState(const char* fmt, ...);
|
|
#endif
|
|
};
|
|
|
|
#endif
|