mirror of
https://github.com/MariaDB/server.git
synced 2025-01-24 15:54:37 +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
1654 lines
47 KiB
C++
1654 lines
47 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 */
|
|
|
|
/* ***************************************************
|
|
FLEXSCAN
|
|
Perform benchmark of:
|
|
insert
|
|
read
|
|
scan read
|
|
update
|
|
scan update
|
|
read
|
|
scan delete
|
|
verify delete
|
|
|
|
Arguments:
|
|
-f Location of my.cnf file, default my.cnf
|
|
-t Number of threads to start, default 1
|
|
-o Number of operations per loop, default 500 -l Number of loops to run, default 1, 0=infinite
|
|
-a Number of attributes, default 25
|
|
-c Number of tables, default 1
|
|
-s Size of each attribute, default 1
|
|
-stdtables Use standard table names
|
|
-no_table_create Don't create tables in db
|
|
-sleep Sleep a number of seconds before running the test, this
|
|
can be used so that another flexBench hav etome to create tables
|
|
-p Parallellism to use 1-32, default:1
|
|
-abort <number> Test scan abort after a number of tuples
|
|
-h Print help text
|
|
-no_scan_update Don't do scan updates
|
|
-no_scan_delete Don't do scan deletes
|
|
|
|
Returns:
|
|
NDBT_OK - Test passed
|
|
NDBT_FAILED - Test failed
|
|
|
|
Revision history:
|
|
1.12 020222 epesson: Rewritten to use NDBT. Major bugs fixed
|
|
|
|
* *************************************************** */
|
|
|
|
#include "NdbApi.hpp"
|
|
|
|
#include <NdbThread.h>
|
|
#include <NdbSleep.h>
|
|
#include <NdbTick.h>
|
|
#include <NdbOut.hpp>
|
|
#include <NdbTimer.hpp>
|
|
#include <NdbMain.h>
|
|
#include <NdbTest.hpp>
|
|
#include <NDBT_Error.hpp>
|
|
#include <NdbSchemaCon.hpp>
|
|
|
|
#define PKSIZE 1
|
|
#define FOREVER 1
|
|
#define MAXSTRLEN 16
|
|
#define MAXATTR 64
|
|
#define MAXTABLES 64
|
|
#define MAXTHREADS 256
|
|
#define MAXATTRSIZE 64
|
|
|
|
enum StartType {
|
|
stIdle,
|
|
stInsert,
|
|
stRead,
|
|
stScanRead,
|
|
stUpdate,
|
|
stScanUpdate,
|
|
stDelete,
|
|
stVerifyDelete,
|
|
stScanDelete,
|
|
stStop,
|
|
stLast} ;
|
|
|
|
|
|
struct ThreadNdb
|
|
{
|
|
int ThreadNo;
|
|
NdbThread* threadLife;
|
|
StartType threadStart;
|
|
int threadResult;
|
|
int threadReady;
|
|
};
|
|
|
|
extern "C" void* flexScanThread(void*);
|
|
static int setAttrNames(void);
|
|
static int setTableNames(void);
|
|
static int createTables(Ndb* pMyNdb);
|
|
static void sleepBeforeStartingTest(int seconds);
|
|
static int readArguments(int argc, const char** argv);
|
|
static void setAttrValues(int* attrValue,
|
|
int* readValue,
|
|
int Offset);
|
|
static int insertRows(Ndb* pNdb, int* pkValue, int* attrValue, StartType tType);
|
|
static int readRows(Ndb* pNdb, int* pkValue, int* readValue);
|
|
static int deleteRows(Ndb* pNdb, int* pkValue);
|
|
static int scanReadRows(Ndb* pNdb, int* readValue);
|
|
static int scanUpdateRows(Ndb* pNdb, int* readValue, int* attrValue);
|
|
static int scanDeleteRows(Ndb* pNdb, int* readValue);
|
|
static int verifyDeleteRows(Ndb* pNdb, int* pkValue, int* readValue);
|
|
static void Compare(int* attrValue, int* readValue);
|
|
static void UpdateArray(int *attrValue);
|
|
|
|
static int tNoOfThreads = 1;
|
|
static int tNoOfAttributes = 25;
|
|
static int tNoOfTables = 1;
|
|
static int tAttributeSize = 1;
|
|
static int tNodeId = 0;
|
|
static int tNoOfOperations = 500;
|
|
static int tNoOfLoops = 1;
|
|
static int tAbortAfter = 0;
|
|
static int tParallellism = 1;
|
|
|
|
static char tableName[MAXTABLES][MAXSTRLEN];
|
|
static char attrName[MAXATTR][MAXSTRLEN];
|
|
|
|
static unsigned int tSleepTime = 0;
|
|
|
|
static int theStdTableNameFlag = 0;
|
|
static int theTableCreateFlag = 0;
|
|
static int theScanAbortTestFlag = 0;
|
|
static int theNoScanUpdateFlag = 0;
|
|
static int theNoScanDeleteFlag = 0;
|
|
|
|
//flexScanErrorData = new ErrorData;
|
|
ErrorData * flexScanErrorData;
|
|
NdbError * anerror;
|
|
|
|
//static errorData theErrorData;
|
|
//static unsigned int tErrorCounter[6000];
|
|
|
|
#define START_TIMER { NdbTimer timer; timer.doStart();
|
|
#define STOP_TIMER timer.doStop();
|
|
#define PRINT_TIMER(text, trans, opertrans) timer.printTransactionStatistics(text, trans, opertrans); };
|
|
|
|
static void UpdateArray(int *attrValue)
|
|
{
|
|
int tableCount = 0;
|
|
int attrCount = 0;
|
|
int opCount = 0;
|
|
int sizeCount = 0;
|
|
int* pValue = attrValue;
|
|
|
|
for (tableCount = 0; tableCount < tNoOfTables; tableCount++) {
|
|
for (attrCount = 0; attrCount < tNoOfAttributes-1; attrCount++) {
|
|
for (opCount = 0; opCount < tNoOfOperations; opCount++) {
|
|
for (sizeCount = 0; sizeCount < tAttributeSize; sizeCount++) {
|
|
// Update value in array
|
|
(*pValue)++;
|
|
//ndbout << "attrValue[" << tableCount*tNoOfAttributes*tNoOfOperations*tAttributeSize +
|
|
//attrCount*tNoOfOperations*tAttributeSize + opCount*tAttributeSize + sizeCount <<
|
|
//"] = " << attrValue[tableCount*tNoOfAttributes*tNoOfOperations*tAttributeSize +
|
|
//attrCount*tNoOfOperations*tAttributeSize + opCount*tAttributeSize + sizeCount] << endl;
|
|
// Increment pointer
|
|
pValue++;
|
|
} // sizeCount
|
|
} // for opCount
|
|
} // for attrCount
|
|
} // for tableCount
|
|
|
|
} // Update
|
|
|
|
static void Compare(int* attrValue, int* readValue)
|
|
{
|
|
int tableCount = 0;
|
|
int attrCount = 0;
|
|
int OpCount = 0;
|
|
int first = 0;
|
|
|
|
for (tableCount = 0; tableCount < tNoOfTables; tableCount++) {
|
|
for (attrCount = 0; attrCount < tNoOfAttributes-1; attrCount++) {
|
|
for (OpCount = 0; OpCount < tNoOfOperations; OpCount++) {
|
|
if (memcmp(&(attrValue[tableCount*(tNoOfAttributes-1)*tNoOfOperations +
|
|
attrCount*tNoOfOperations + OpCount]),
|
|
&(readValue[tableCount*(tNoOfAttributes-1)*tNoOfOperations +
|
|
attrCount*tNoOfOperations + OpCount]),
|
|
tAttributeSize) != 0) {
|
|
// Values mismatch
|
|
if (first == 0) {
|
|
//ndbout << "Read and set values differ for:" << endl;
|
|
first = 1;
|
|
ndbout << "Mismatch found.";
|
|
} // if
|
|
// Comparision of values after scan update is meaningless right now
|
|
//ndbout << " table " << tableName[tableCount] <<
|
|
//" - attr " << attrName[attrCount+1];
|
|
//for (sizeCount = 0; sizeCount < tAttributeSize; sizeCount++) {
|
|
//ndbout << ": set " <<
|
|
//attrValue[tableCount*(tNoOfAttributes-1)*tNoOfOperations*tAttributeSize +
|
|
//attrCount*tNoOfOperations*tAttributeSize +
|
|
//tNoOfOperations*tAttributeSize + sizeCount] << " read " <<
|
|
//readValue[tableCount*(tNoOfAttributes-1)*tNoOfOperations*tAttributeSize +
|
|
//attrCount*tNoOfOperations*tAttributeSize +
|
|
//tNoOfOperations*tAttributeSize + sizeCount] << endl;
|
|
//} // for
|
|
} // if
|
|
} // for OpCount
|
|
} // for attrCount
|
|
} // for tableCount
|
|
|
|
// A final pretty-print
|
|
if (first == 1) {
|
|
ndbout << endl;
|
|
} // if
|
|
} // Compare
|
|
|
|
static void printInfo()
|
|
{
|
|
ndbout << endl << "FLEXSCAN - Starting normal mode" << endl;
|
|
ndbout << "Perform benchmark of insert, update and delete transactions"<< endl;
|
|
ndbout << " NdbAPI node with id = " << tNodeId << endl;
|
|
ndbout << " " << tNoOfThreads << " thread(s) " << endl;
|
|
ndbout << " " << tNoOfLoops << " iterations " << endl;
|
|
ndbout << " " << tNoOfTables << " table(s) and " << 1 << " operation(s) per transaction "
|
|
<< endl;
|
|
ndbout << " " << tNoOfAttributes << " attributes per table incl. pk" << endl;
|
|
ndbout << " " << tNoOfOperations << " transaction(s) per thread and round " << endl;
|
|
if (theScanAbortTestFlag == 1) {
|
|
ndbout << " Scan abort test after " << tAbortAfter << " tuples" << endl;
|
|
} // if
|
|
ndbout << " " << tParallellism << " parallellism in scans" << endl;
|
|
ndbout << " " << tAttributeSize << " is the number of 32 bit words per attribute " <<
|
|
endl << endl;
|
|
|
|
} // printInfo
|
|
|
|
static void tellThreads(ThreadNdb *threadArrayP, StartType what)
|
|
{
|
|
int i = 0;
|
|
|
|
for (i = 0; i < tNoOfThreads ; i++)
|
|
threadArrayP[i].threadStart = what;
|
|
} // tellThreads
|
|
|
|
static void waitForThreads(ThreadNdb *threadArrayP)
|
|
{
|
|
int i = 0;
|
|
int cont = 1;
|
|
|
|
while (cont == 1){
|
|
|
|
NdbSleep_MilliSleep(10);
|
|
cont = 0;
|
|
|
|
for (i = 0; i < tNoOfThreads ; i++) {
|
|
if (threadArrayP[i].threadReady == 0) {
|
|
// ndbout << "Main is reporting thread " << i << " not ready" << endl;
|
|
cont = 1;
|
|
} // if
|
|
} // for
|
|
} // while
|
|
} // waitForThreads
|
|
|
|
|
|
static void resetThreads(ThreadNdb *threadArrayP)
|
|
{
|
|
int i = 0;
|
|
|
|
for (i = 0; i < tNoOfThreads ; i++) {
|
|
threadArrayP[i].threadReady = 0;
|
|
threadArrayP[i].threadResult = 0;
|
|
threadArrayP[i].threadStart = stIdle;
|
|
//ndbout << "threadStart[" << i << "]=" <<
|
|
//threadArrayP[i].threadStart << endl;
|
|
} // for
|
|
} // resetThreads
|
|
|
|
static int checkThreadResults(ThreadNdb *threadArrayP, char *action)
|
|
{
|
|
int i = 0;
|
|
int retValue = 0;
|
|
|
|
for (i = 0; i < tNoOfThreads; i++) {
|
|
if (threadArrayP[i].threadResult != 0) {
|
|
ndbout << "Thread " << i << " reported fatal error "
|
|
<< threadArrayP[i].threadResult << " during " << action << endl;
|
|
retValue = -1;
|
|
break;
|
|
} // if
|
|
} // for
|
|
|
|
return(retValue);
|
|
} // checkThreadResults
|
|
|
|
NDB_COMMAND(flexScan, "flexScan", "flexScan", "flexScan", 65535)
|
|
{
|
|
ndb_init();
|
|
ThreadNdb* pThreads = NULL;
|
|
Ndb* pMyNdb = NULL;
|
|
int tLoops = 0;
|
|
int check = 0;
|
|
int returnValue = NDBT_OK;
|
|
int every2ndScanDelete = 0; // Switch between scan delete and normal delete
|
|
|
|
flexScanErrorData = new ErrorData;
|
|
|
|
flexScanErrorData->resetErrorCounters();
|
|
|
|
if (readArguments(argc, argv) != 0) {
|
|
ndbout << "Wrong arguments to flexScan" << endl;
|
|
return NDBT_ProgramExit(NDBT_WRONGARGS);
|
|
} // if
|
|
|
|
/* print Setting */
|
|
flexScanErrorData->printSettings(ndbout);
|
|
|
|
check = setAttrNames();
|
|
if (check != 0) {
|
|
ndbout << "Couldn't set attribute names" << endl;
|
|
return NDBT_ProgramExit(NDBT_FAILED);
|
|
} // if
|
|
check = setTableNames();
|
|
if (check != 0) {
|
|
ndbout << "Couldn't set table names" << endl;
|
|
return NDBT_ProgramExit(NDBT_FAILED);
|
|
} // if
|
|
|
|
pMyNdb = new Ndb ("TEST_DB");
|
|
pMyNdb->init();
|
|
tNodeId = pMyNdb->getNodeId();
|
|
|
|
printInfo();
|
|
|
|
NdbThread_SetConcurrencyLevel(tNoOfThreads + 2);
|
|
//NdbThread_SetConcurrencyLevel(tNoOfThreads + 8);
|
|
|
|
pThreads = new ThreadNdb[tNoOfThreads];
|
|
|
|
if (pMyNdb->waitUntilReady(10000) != 0) {
|
|
ndbout << "NDB is not ready" << endl << "Benchmark failed" << endl;
|
|
returnValue = NDBT_FAILED;
|
|
} // if
|
|
|
|
else {
|
|
|
|
if (createTables(pMyNdb) != 0) {
|
|
ndbout << "Could not create tables" << endl;
|
|
returnValue = NDBT_FAILED;
|
|
} // if
|
|
else {
|
|
sleepBeforeStartingTest(tSleepTime);
|
|
|
|
resetThreads(pThreads);
|
|
// Create threads
|
|
for (int i = 0; i < tNoOfThreads ; i++){
|
|
pThreads[i].ThreadNo = i;
|
|
// Ignore the case that thread creation may fail
|
|
pThreads[i].threadLife = NdbThread_Create(flexScanThread,
|
|
(void**)&pThreads[i],
|
|
327680,
|
|
"flexScanThread", NDB_THREAD_PRIO_LOW);
|
|
if (pThreads[i].threadLife == NULL) {
|
|
ndbout << "Could not create thread " << i << endl;
|
|
returnValue = NDBT_FAILED;
|
|
// Use the number of threads that were actually created
|
|
tNoOfThreads = i;
|
|
break; // break for loop
|
|
} // if
|
|
} // for
|
|
|
|
waitForThreads(pThreads);
|
|
if (checkThreadResults(pThreads, "init") != 0) {
|
|
returnValue = NDBT_FAILED;
|
|
} // if
|
|
|
|
if (returnValue == NDBT_OK) {
|
|
ndbout << "All threads started" << endl;
|
|
|
|
while (FOREVER) {
|
|
|
|
resetThreads(pThreads);
|
|
|
|
if ((tNoOfLoops != 0) && (tNoOfLoops <= tLoops)) {
|
|
break;
|
|
} // if
|
|
|
|
// Insert
|
|
START_TIMER;
|
|
|
|
tellThreads(pThreads, stInsert);
|
|
waitForThreads(pThreads);
|
|
|
|
STOP_TIMER;
|
|
if (checkThreadResults(pThreads, "insert") != 0) {
|
|
returnValue = NDBT_FAILED;
|
|
break;
|
|
} // if
|
|
PRINT_TIMER("insert", tNoOfOperations*tNoOfThreads, tNoOfTables);
|
|
|
|
resetThreads(pThreads);
|
|
|
|
// Read
|
|
START_TIMER;
|
|
|
|
tellThreads(pThreads, stRead);
|
|
waitForThreads(pThreads);
|
|
|
|
STOP_TIMER;
|
|
if (checkThreadResults(pThreads, "read") != 0) {
|
|
returnValue = NDBT_FAILED;
|
|
break;
|
|
} // if
|
|
PRINT_TIMER("read", tNoOfOperations*tNoOfThreads, tNoOfTables);
|
|
|
|
resetThreads(pThreads);
|
|
|
|
// Update
|
|
START_TIMER;
|
|
|
|
tellThreads(pThreads, stUpdate);
|
|
waitForThreads(pThreads);
|
|
|
|
STOP_TIMER;
|
|
if (checkThreadResults(pThreads, "update") != 0) {
|
|
returnValue = NDBT_FAILED;
|
|
break;
|
|
} // if
|
|
PRINT_TIMER("update", tNoOfOperations*tNoOfThreads, tNoOfTables);
|
|
|
|
resetThreads(pThreads);
|
|
|
|
// Scan read
|
|
START_TIMER;
|
|
|
|
tellThreads(pThreads, stScanRead);
|
|
waitForThreads(pThreads);
|
|
|
|
STOP_TIMER;
|
|
if (checkThreadResults(pThreads, "scanread") != 0) {
|
|
returnValue = NDBT_FAILED;
|
|
break;
|
|
} // if
|
|
PRINT_TIMER("scanread", tNoOfTables*tNoOfThreads, 1);
|
|
|
|
resetThreads(pThreads);
|
|
|
|
// Update
|
|
START_TIMER;
|
|
|
|
tellThreads(pThreads, stUpdate);
|
|
waitForThreads(pThreads);
|
|
|
|
STOP_TIMER;
|
|
if (checkThreadResults(pThreads, "update") != 0) {
|
|
returnValue = NDBT_FAILED;
|
|
break;
|
|
} // if
|
|
PRINT_TIMER("update", tNoOfOperations*tNoOfThreads, tNoOfTables);
|
|
|
|
resetThreads(pThreads);
|
|
|
|
// Read
|
|
START_TIMER;
|
|
|
|
tellThreads(pThreads, stRead);
|
|
waitForThreads(pThreads);
|
|
|
|
STOP_TIMER;
|
|
if (checkThreadResults(pThreads, "read") != 0) {
|
|
returnValue = NDBT_FAILED;
|
|
break;
|
|
} // if
|
|
PRINT_TIMER("read", tNoOfOperations*tNoOfThreads, tNoOfTables);
|
|
|
|
resetThreads(pThreads);
|
|
|
|
// Only do scan update if told to do so
|
|
if (theNoScanUpdateFlag == 0) {
|
|
// Scan update
|
|
START_TIMER;
|
|
|
|
tellThreads(pThreads, stScanUpdate);
|
|
waitForThreads(pThreads);
|
|
|
|
STOP_TIMER;
|
|
if (checkThreadResults(pThreads, "scanupdate") != 0) {
|
|
returnValue = NDBT_FAILED;
|
|
break;
|
|
} // if
|
|
PRINT_TIMER("scanupdate", tNoOfTables*tNoOfThreads, 1);
|
|
|
|
resetThreads(pThreads);
|
|
|
|
// Read
|
|
START_TIMER;
|
|
|
|
tellThreads(pThreads, stRead);
|
|
// tellThreads(pThreads, stScanRead);
|
|
waitForThreads(pThreads);
|
|
|
|
STOP_TIMER;
|
|
if (checkThreadResults(pThreads, "read") != 0) {
|
|
returnValue = NDBT_FAILED;
|
|
break;
|
|
} // if
|
|
PRINT_TIMER("read", tNoOfOperations*tNoOfThreads, tNoOfTables);
|
|
|
|
resetThreads(pThreads);
|
|
} // if theNoScanUpdateFlag
|
|
|
|
// Shift between delete and scan delete
|
|
if ((every2ndScanDelete % 2 == 0) || (theNoScanDeleteFlag == 1)){
|
|
// Delete
|
|
START_TIMER;
|
|
tellThreads(pThreads, stDelete);
|
|
waitForThreads(pThreads);
|
|
|
|
STOP_TIMER;
|
|
if (checkThreadResults(pThreads, "delete") != 0) {
|
|
returnValue = NDBT_FAILED;
|
|
break;
|
|
} // if
|
|
PRINT_TIMER("delete", tNoOfOperations*tNoOfThreads, tNoOfTables);
|
|
resetThreads(pThreads);
|
|
} // if
|
|
else {
|
|
resetThreads(pThreads); // Scan delete
|
|
START_TIMER;
|
|
tellThreads(pThreads, stScanDelete);
|
|
waitForThreads(pThreads);
|
|
|
|
STOP_TIMER;
|
|
if (checkThreadResults(pThreads, "scandelete") != 0) {
|
|
returnValue = NDBT_FAILED;
|
|
break;
|
|
} // if
|
|
PRINT_TIMER("scandelete", tNoOfTables*tNoOfThreads, 1);
|
|
|
|
resetThreads(pThreads);
|
|
} // else
|
|
every2ndScanDelete++;
|
|
|
|
resetThreads(pThreads); // Verify delete
|
|
START_TIMER;
|
|
tellThreads(pThreads, stVerifyDelete);
|
|
waitForThreads(pThreads);
|
|
|
|
STOP_TIMER;
|
|
if (checkThreadResults(pThreads, "verifydelete") != 0) {
|
|
returnValue = NDBT_FAILED;
|
|
break;
|
|
} // if
|
|
PRINT_TIMER("verifydelete", tNoOfOperations*tNoOfThreads*tNoOfTables, 1);
|
|
|
|
resetThreads(pThreads);
|
|
|
|
ndbout << "--------------------------------------------------" << endl;
|
|
tLoops++;
|
|
|
|
} // while
|
|
} // if
|
|
} // else
|
|
} // else
|
|
|
|
// Stop threads in a nice way
|
|
tellThreads(pThreads, stStop);
|
|
waitForThreads(pThreads);
|
|
|
|
// Clean up
|
|
delete [] pThreads;
|
|
delete pMyNdb;
|
|
|
|
flexScanErrorData->printErrorCounters(ndbout);
|
|
|
|
if (returnValue == NDBT_OK) {
|
|
ndbout << endl << "Benchmark completed successfully" << endl;
|
|
} // if
|
|
else {
|
|
ndbout << endl << "Benchmark failed" << endl;
|
|
} // else
|
|
|
|
// Exit via NDBT
|
|
return NDBT_ProgramExit(returnValue);;
|
|
} // main
|
|
|
|
void*
|
|
flexScanThread(void* ThreadData)
|
|
{
|
|
ThreadNdb* pThreadData = (ThreadNdb*)ThreadData;
|
|
unsigned int thread_no = pThreadData->ThreadNo;
|
|
unsigned int thread_base = (thread_no * 2000000) + (tNodeId * 26000);
|
|
int tThreadResult = 0;
|
|
Ndb* MyNdb = NULL;
|
|
int check = 0;
|
|
StartType tType = stLast;
|
|
int* pkValue = NULL;
|
|
int* attrValue = NULL;
|
|
int* readValue = NULL;
|
|
int AllocSize = 0;
|
|
|
|
AllocSize = tNoOfTables * (tNoOfAttributes-1) * tNoOfOperations *
|
|
tAttributeSize * sizeof(int);
|
|
attrValue = (int*)malloc(AllocSize);
|
|
readValue = (int*)malloc(AllocSize);
|
|
pkValue = (int*)malloc(tNoOfOperations * sizeof(int));
|
|
if ((attrValue == NULL) || (readValue == NULL) || (pkValue == NULL)) {
|
|
tThreadResult = 98;
|
|
pThreadData->threadStart = stIdle;
|
|
} // if
|
|
|
|
setAttrValues(attrValue, readValue, thread_base);
|
|
|
|
MyNdb = new Ndb( "TEST_DB" );
|
|
MyNdb->init();
|
|
if (MyNdb->waitUntilReady(10000) != 0) {
|
|
tThreadResult = 99;
|
|
pThreadData->threadStart = stIdle;
|
|
} // if
|
|
|
|
// Set primary key value, same for all tables
|
|
for (int c = 0; c < tNoOfOperations; c++) {
|
|
pkValue[c] = (int)(c + thread_base);
|
|
} // for
|
|
|
|
while (FOREVER) {
|
|
pThreadData->threadResult = tThreadResult;
|
|
pThreadData->threadReady = 1;
|
|
|
|
while (pThreadData->threadStart == stIdle) {
|
|
NdbSleep_MilliSleep(10);
|
|
} // while
|
|
|
|
// Check if signal to exit is received
|
|
if (pThreadData->threadStart >= stStop){
|
|
pThreadData->threadReady = 1;
|
|
break;
|
|
} // if
|
|
tType = pThreadData->threadStart;
|
|
pThreadData->threadStart = stIdle;
|
|
|
|
switch (tType) {
|
|
case stInsert:
|
|
check = insertRows(MyNdb, pkValue, attrValue, tType);
|
|
break;
|
|
case stRead:
|
|
check = readRows(MyNdb, pkValue, readValue);
|
|
Compare(attrValue, readValue);
|
|
break;
|
|
case stUpdate:
|
|
UpdateArray(attrValue);
|
|
check = insertRows(MyNdb, pkValue, attrValue, tType);
|
|
break;
|
|
case stScanRead:
|
|
//check = readRows(MyNdb, pkValue, readValue);
|
|
check = scanReadRows(MyNdb, readValue);
|
|
Compare(attrValue, readValue);
|
|
break;
|
|
case stScanUpdate:
|
|
UpdateArray(attrValue);
|
|
//tType = stUpdate;
|
|
//check = insertRows(MyNdb, pkValue, attrValue, tType);
|
|
check = scanUpdateRows(MyNdb, readValue, attrValue);
|
|
break;
|
|
case stDelete:
|
|
check = deleteRows(MyNdb, pkValue);
|
|
break;
|
|
case stScanDelete:
|
|
check = scanDeleteRows(MyNdb, readValue);
|
|
break;
|
|
case stVerifyDelete:
|
|
check = verifyDeleteRows(MyNdb, pkValue, readValue);
|
|
break;
|
|
default:
|
|
ndbout << "tType is " << tType << endl;
|
|
assert(false);
|
|
break;
|
|
} // switch
|
|
|
|
tThreadResult = check;
|
|
|
|
if (tThreadResult != 0) {
|
|
// Check if error is fatak or not
|
|
} // if
|
|
else {
|
|
continue;
|
|
} // else
|
|
} // while
|
|
|
|
// Clean up
|
|
delete MyNdb;
|
|
if (attrValue != NULL) {
|
|
free(attrValue);
|
|
} //if
|
|
if (readValue != NULL) {
|
|
free(readValue);
|
|
} // if
|
|
if (pkValue != NULL) {
|
|
free(pkValue);
|
|
} // if
|
|
|
|
return NULL; // thread exits
|
|
|
|
} // flexScanThread
|
|
|
|
|
|
static int setAttrNames()
|
|
{
|
|
int i = 0;
|
|
int retVal = 0;
|
|
|
|
for (i = 0; i < MAXATTR ; i++) {
|
|
retVal = BaseString::snprintf(attrName[i], MAXSTRLEN, "COL%d", i);
|
|
if (retVal < 0) {
|
|
return(-1);
|
|
} // if
|
|
} // for
|
|
|
|
return(0);
|
|
} // setAttrNames
|
|
|
|
|
|
static int setTableNames()
|
|
{
|
|
// Note! Uses only uppercase letters in table name's
|
|
// so that we can look at the tables with SQL
|
|
int i = 0;
|
|
int retVal = 0;
|
|
|
|
for (i = 0; i < MAXTABLES ; i++) {
|
|
|
|
if (theStdTableNameFlag == 0) {
|
|
retVal = BaseString::snprintf(tableName[i], MAXSTRLEN, "TAB%d_%d", i,
|
|
(int)(NdbTick_CurrentMillisecond() / 1000));
|
|
} // if
|
|
else {
|
|
retVal = BaseString::snprintf(tableName[i], MAXSTRLEN, "TAB%d", i);
|
|
} // if else
|
|
|
|
if (retVal < 0) {
|
|
return(-1);
|
|
} // if
|
|
} // for
|
|
|
|
return(0);
|
|
} // setTableNames
|
|
|
|
|
|
// Create Table and Attributes.
|
|
static int createTables(Ndb* pMyNdb)
|
|
{
|
|
|
|
NdbSchemaCon *MySchemaTransaction = NULL;
|
|
NdbSchemaOp *MySchemaOp = NULL;
|
|
int i = 0;
|
|
int j = 0;
|
|
int check = 0;
|
|
|
|
if (theTableCreateFlag == 0) {
|
|
|
|
i = 0;
|
|
do {
|
|
i++;
|
|
ndbout << endl << "Creating " << tableName[i - 1] << "..." << endl;
|
|
|
|
MySchemaTransaction = NdbSchemaCon::startSchemaTrans(pMyNdb);
|
|
if( MySchemaTransaction == NULL ) {
|
|
return (-1);
|
|
} // if
|
|
|
|
MySchemaOp = MySchemaTransaction->getNdbSchemaOp();
|
|
if( MySchemaOp == NULL ) {
|
|
NdbSchemaCon::closeSchemaTrans(MySchemaTransaction);
|
|
return (-1);
|
|
} // if
|
|
|
|
check = MySchemaOp->createTable(tableName[i - 1]
|
|
,8 // Table Size
|
|
,TupleKey // Key Type
|
|
,40); // Nr of Pages
|
|
|
|
if (check == -1) {
|
|
NdbSchemaCon::closeSchemaTrans(MySchemaTransaction);
|
|
return -1;
|
|
} // if
|
|
|
|
check = MySchemaOp->createAttribute( (char*)attrName[0], TupleKey, 32, PKSIZE,
|
|
UnSigned, MMBased, NotNullAttribute );
|
|
if (check == -1) {
|
|
NdbSchemaCon::closeSchemaTrans(MySchemaTransaction);
|
|
return -1;
|
|
} // if
|
|
|
|
for (j = 1; j < tNoOfAttributes ; j++) {
|
|
check = MySchemaOp->createAttribute( (char*)attrName[j], NoKey, 32, tAttributeSize,
|
|
UnSigned, MMBased, NotNullAttribute );
|
|
if (check == -1) {
|
|
NdbSchemaCon::closeSchemaTrans(MySchemaTransaction);
|
|
return -1;
|
|
} // if
|
|
} // for
|
|
|
|
if (MySchemaTransaction->execute() == -1) {
|
|
ndbout << MySchemaTransaction->getNdbError().message << endl;
|
|
ndbout << "Probably, " << tableName[i - 1] << " already exist" << endl;
|
|
} // if
|
|
|
|
NdbSchemaCon::closeSchemaTrans(MySchemaTransaction);
|
|
} while (tNoOfTables > i);
|
|
}
|
|
|
|
return 0;
|
|
} // createTables
|
|
|
|
static void printUsage()
|
|
{
|
|
ndbout << "Usage of flexScan:" << endl;
|
|
ndbout << "-f <path> Location of my.cnf file, default: my.cnf" << endl;
|
|
ndbout << "-t <int> Number of threads to start, default 1" << endl;
|
|
ndbout << "-o <int> Number of operations per loop, default 500" << endl;
|
|
ndbout << "-l <int> Number of loops to run, default 1, 0=infinite" << endl;
|
|
ndbout << "-a <int> Number of attributes, default 25" << endl;
|
|
ndbout << "-c <int> Number of tables, default 1" << endl;
|
|
ndbout << "-s <int> Size of each attribute, default 1" << endl;
|
|
ndbout << "-stdtables Use standard table names" << endl;
|
|
ndbout << "-no_table_create Don't create tables in db" << endl;
|
|
ndbout << "-sleep <int> Sleep a number of seconds before running the test" << endl;
|
|
ndbout << "-p <int> Parallellism to use 1-32, default:1" << endl;
|
|
ndbout << "-abort <int> Test scan abort after a number of tuples" << endl;
|
|
ndbout << "-no_scan_update Don't do scan updates" << endl;
|
|
ndbout << "-no_scan_delete Don't do scan deletes" << endl;
|
|
ndbout << "-h Print this text" << endl;
|
|
// inputErrorArg();
|
|
flexScanErrorData->printCmdLineArgs(ndbout);
|
|
}
|
|
|
|
static int readArguments(int argc, const char** argv)
|
|
{
|
|
int i = 1;
|
|
int retValue = 0;
|
|
int printFlag = 0;
|
|
|
|
tNoOfThreads = 1; // Set default Value
|
|
tNoOfTables = 1; // Default Value
|
|
|
|
while (argc > 1) {
|
|
if (strcmp(argv[i], "-t") == 0) {
|
|
if (argv[i + 1] != NULL) {
|
|
tNoOfThreads = atoi(argv[i + 1]);
|
|
if ((tNoOfThreads < 1) || (tNoOfThreads > MAXTHREADS)) {
|
|
retValue = -1;
|
|
} // if
|
|
} // if
|
|
else {
|
|
retValue = -1;
|
|
} // else
|
|
} // if
|
|
else if (strcmp(argv[i], "-o") == 0) {
|
|
if (argv[i + 1] != NULL) {
|
|
tNoOfOperations = atoi(argv[i + 1]);
|
|
if (tNoOfOperations < 1) {
|
|
retValue = -1;
|
|
} // if
|
|
} // if
|
|
else {
|
|
retValue = -1;
|
|
} // else
|
|
} // else if
|
|
else if (strcmp(argv[i], "-a") == 0) {
|
|
if (argv[i + 1] != NULL) {
|
|
tNoOfAttributes = atoi(argv[i + 1]);
|
|
if ((tNoOfAttributes < 2) || (tNoOfAttributes > MAXATTR)) {
|
|
retValue = -1;
|
|
} // if
|
|
} // if
|
|
else {
|
|
retValue = -1;
|
|
} // else
|
|
} // else if
|
|
else if (strcmp(argv[i], "-c") == 0) {
|
|
if (argv[i + 1] != NULL) {
|
|
tNoOfTables = atoi(argv[i+1]);
|
|
if ((tNoOfTables < 1) || (tNoOfTables > MAXTABLES)) {
|
|
retValue = -1;
|
|
} // if
|
|
} // if
|
|
else {
|
|
retValue = -1;
|
|
} // else
|
|
} // else if
|
|
else if (strcmp(argv[i], "-l") == 0) {
|
|
if (argv[i + 1] != NULL) {
|
|
tNoOfLoops = atoi(argv[i+1]);
|
|
if ((tNoOfLoops < 0) || (tNoOfLoops > 100000)) {
|
|
retValue = -1;
|
|
} // if
|
|
} // if
|
|
else {
|
|
retValue = -1;
|
|
} // else
|
|
} // else if
|
|
else if (strcmp(argv[i], "-s") == 0) {
|
|
if (argv[i + 1] != NULL) {
|
|
tAttributeSize = atoi(argv[i+1]);
|
|
if ((tAttributeSize < 1) || (tAttributeSize > MAXATTRSIZE)) {
|
|
retValue = -1;
|
|
} // if
|
|
} // if
|
|
else {
|
|
retValue = -1;
|
|
} // else
|
|
} // else if
|
|
else if (strcmp(argv[i], "-no_table_create") == 0) {
|
|
theTableCreateFlag = 1;
|
|
argc++;
|
|
i--;
|
|
} // else if
|
|
else if (strcmp(argv[i], "-stdtables") == 0) {
|
|
theStdTableNameFlag = 1;
|
|
argc++;
|
|
i--;
|
|
} // else if
|
|
else if (strcmp(argv[i], "-sleep") == 0) {
|
|
if (argv[i + 1] != NULL) {
|
|
tSleepTime = atoi(argv[i+1]);
|
|
if ((tSleepTime < 1) || (tSleepTime > 3600)) {
|
|
retValue = -1;
|
|
} // if
|
|
} // if
|
|
else {
|
|
retValue = -1;
|
|
} // else
|
|
} // else if
|
|
else if (strcmp(argv[i], "-abort") == 0) {
|
|
// Test scan abort after a number of tuples
|
|
theScanAbortTestFlag = 1;
|
|
if (argv[i + 1] != NULL) {
|
|
tAbortAfter = atoi(argv[i + 1]);
|
|
} // if
|
|
else {
|
|
retValue = -1;
|
|
} // else
|
|
} // else if
|
|
else if (strcmp(argv[i], "-p") == 0) {
|
|
if (argv[i + 1] != NULL) {
|
|
tParallellism = atoi(argv[i + 1]);
|
|
if ((tParallellism < 1) || (tParallellism > 32)) {
|
|
retValue = -1;
|
|
} // if
|
|
} // if
|
|
else {
|
|
retValue = -1;
|
|
} // else
|
|
} // else if
|
|
else if (strcmp(argv[i], "-h") == 0) {
|
|
printFlag = 1;
|
|
argc++;
|
|
i--;
|
|
} // else if
|
|
else if (strcmp(argv[i], "-no_scan_update") == 0) {
|
|
theNoScanUpdateFlag = 1;
|
|
argc++;
|
|
i--;
|
|
} // else if
|
|
else if (strcmp(argv[i], "-no_scan_delete") == 0) {
|
|
theNoScanDeleteFlag = 1;
|
|
argc++;
|
|
i--;
|
|
} // else if
|
|
else {
|
|
retValue = -1;
|
|
} // else
|
|
|
|
argc -= 2;
|
|
i = i + 2;
|
|
}
|
|
|
|
if ((retValue != 0) || (printFlag == 1)) {
|
|
printUsage();
|
|
} // if
|
|
|
|
return(retValue);
|
|
|
|
} // readArguments
|
|
|
|
static void sleepBeforeStartingTest(int seconds)
|
|
{
|
|
if (seconds > 0) {
|
|
ndbout << "Sleeping(" <<seconds << ")...";
|
|
NdbSleep_SecSleep(seconds);
|
|
ndbout << " done!" << endl;
|
|
} // if
|
|
} // sleepBeforeStartingTest
|
|
|
|
static void setAttrValues(int* attrValue,
|
|
int* readValue,
|
|
int Offset)
|
|
{
|
|
int tableCount = 0;
|
|
int attrCount = 0;
|
|
int OpCount = 0;
|
|
int attrSize = 0;
|
|
int* pAttr = NULL;
|
|
int* pRead = NULL;
|
|
|
|
// Set attribute values in memory array
|
|
for (tableCount = 0; tableCount < tNoOfTables; tableCount++) {
|
|
for (attrCount = 0; attrCount < tNoOfAttributes-1; attrCount++) {
|
|
for (OpCount = 0; OpCount < tNoOfOperations; OpCount++) {
|
|
pAttr = &(attrValue[tableCount*(tNoOfAttributes-1)*tNoOfOperations +
|
|
attrCount*tNoOfOperations + OpCount]);
|
|
pRead = &(readValue[tableCount*(tNoOfAttributes-1)*tNoOfOperations +
|
|
attrCount*tNoOfOperations + OpCount]);
|
|
for (attrSize = 0; attrSize < tAttributeSize; attrSize++){
|
|
*pAttr = (int)(Offset + tableCount + attrCount + OpCount + attrSize);
|
|
//ndbout << "attrValue[" << tableCount*(tNoOfAttributes-1)*tNoOfOperations +
|
|
//attrCount*tNoOfOperations + OpCount + attrSize << "] = " <<
|
|
//attrValue[tableCount*(tNoOfAttributes-1)*tNoOfOperations +
|
|
//attrCount*tNoOfOperations + OpCount + attrSize] << endl;
|
|
*pRead = 0;
|
|
pAttr++;
|
|
pRead++;
|
|
} // for attrSize
|
|
} // for OpCount
|
|
} // for attrCount
|
|
} // for tableCount
|
|
|
|
} // setAttrValues
|
|
|
|
static int insertRows(Ndb* pNdb, // NDB object
|
|
int* pkValue, // Primary key values
|
|
int* attrValue, // Attribute values
|
|
StartType tType)
|
|
{
|
|
int tResult = 0;
|
|
int check = 0;
|
|
int tableCount = 0;
|
|
int attrCount = 0;
|
|
NdbConnection* MyTransaction = NULL;
|
|
NdbOperation* MyOperations[MAXTABLES] = {NULL};
|
|
int opCount = 0;
|
|
|
|
for (opCount = 0; opCount < tNoOfOperations; opCount++) {
|
|
MyTransaction = pNdb->startTransaction();
|
|
if (MyTransaction == NULL) {
|
|
tResult = 1;
|
|
} // if
|
|
else {
|
|
for (tableCount = 0; tableCount < tNoOfTables; tableCount++) {
|
|
|
|
MyOperations[tableCount] =
|
|
MyTransaction->getNdbOperation(tableName[tableCount]);
|
|
if (MyOperations[tableCount] == NULL) {
|
|
tResult = 2;
|
|
// Break for tableCount loop
|
|
break;
|
|
} // if
|
|
|
|
if (tType == stUpdate) {
|
|
check = MyOperations[tableCount]->updateTuple();
|
|
} // if
|
|
else if (tType == stInsert) {
|
|
check = MyOperations[tableCount]->insertTuple();
|
|
} // else if
|
|
else {
|
|
assert(false);
|
|
} // else
|
|
|
|
if (check == -1) {
|
|
tResult = 3;
|
|
break;
|
|
} // if
|
|
check = MyOperations[tableCount]->equal((char*)attrName[0],
|
|
(char*)&(pkValue[opCount]));
|
|
if (check == -1) {
|
|
tResult = 7;
|
|
break;
|
|
} // if
|
|
|
|
for (attrCount = 0; attrCount < tNoOfAttributes - 1; attrCount++) {
|
|
int Index = tableCount * (tNoOfAttributes - 1) * tNoOfOperations * tAttributeSize +
|
|
attrCount * tNoOfOperations * tAttributeSize + opCount * tAttributeSize;
|
|
check = MyOperations[tableCount]->
|
|
setValue((char*)attrName[attrCount + 1],
|
|
(char*)&(attrValue[Index]));
|
|
if (check == -1) {
|
|
tResult = 8;
|
|
break; // break attrCount loop
|
|
} // if
|
|
} // for
|
|
} // for tableCount
|
|
|
|
// Execute transaction with insert one tuple in every table
|
|
check = MyTransaction->execute(Commit);
|
|
if (check == -1) {
|
|
ndbout << MyTransaction->getNdbError().message << endl;
|
|
|
|
// Add complete error handling here
|
|
|
|
int retCode = flexScanErrorData->handleErrorCommon(MyTransaction->getNdbError());
|
|
if (retCode == 1) {
|
|
if (MyTransaction->getNdbError().code != 626 && MyTransaction->getNdbError().code != 630){
|
|
ndbout_c("execute: %d, %d, %s", opCount, tType, MyTransaction->getNdbError().message);
|
|
ndbout_c("Error code = %d", MyTransaction->getNdbError().code);}
|
|
tResult = 20;
|
|
} else if (retCode == 2) {
|
|
ndbout << "4115 should not happen in flexBench" << endl;
|
|
tResult = 20;
|
|
} else if (retCode == 3) {
|
|
// --------------------------------------------------------------------
|
|
// We are not certain if the transaction was successful or not.
|
|
// We must reexecute but might very well find that the transaction
|
|
// actually was updated. Updates and Reads are no problem here. Inserts
|
|
// will not cause a problem if error code 630 arrives. Deletes will
|
|
// not cause a problem if 626 arrives.
|
|
// --------------------------------------------------------------------
|
|
/* What can we do here? */
|
|
ndbout_c("execute: %s", MyTransaction->getNdbError().message);
|
|
}//if(retCode == 3)
|
|
|
|
} // if(check == -1)
|
|
|
|
pNdb->closeTransaction(MyTransaction);
|
|
} // else
|
|
} // for opCount
|
|
|
|
return(tResult);
|
|
} // insertRows
|
|
|
|
static int readRows(Ndb* pNdb,
|
|
int* pkValue,
|
|
int* readValue)
|
|
{
|
|
int tResult = 0;
|
|
int tableCount = 0;
|
|
int attrCount = 0;
|
|
int check = 0;
|
|
NdbConnection* MyTransaction = NULL;
|
|
NdbOperation* MyOperations[MAXTABLES] = {NULL};
|
|
NdbRecAttr* tmp = NULL;
|
|
int Value = 0;
|
|
int Index = 0;
|
|
int opCount = 0;
|
|
|
|
for (opCount = 0; opCount < tNoOfOperations; opCount++) {
|
|
MyTransaction = pNdb->startTransaction();
|
|
if (MyTransaction == NULL) {
|
|
tResult = 1;
|
|
} // if
|
|
else {
|
|
for (tableCount = 0; tableCount < tNoOfTables; tableCount++) {
|
|
|
|
MyOperations[tableCount] =
|
|
MyTransaction->getNdbOperation(tableName[tableCount]);
|
|
if (MyOperations[tableCount] == NULL) {
|
|
tResult = 2;
|
|
// Break for tableCount loop
|
|
break;
|
|
} // if
|
|
|
|
check = MyOperations[tableCount]->readTuple();
|
|
if (check == -1) {
|
|
tResult = 3;
|
|
break;
|
|
} // if
|
|
|
|
check = MyOperations[tableCount]->
|
|
equal((char*)attrName[0], (char*)&(pkValue[opCount]));
|
|
if (check == -1) {
|
|
tResult = 7;
|
|
break;
|
|
} // if
|
|
|
|
for (int attrCount = 0; attrCount < tNoOfAttributes - 1; attrCount++) {
|
|
Index = tableCount * (tNoOfAttributes - 1) * tNoOfOperations * tAttributeSize +
|
|
attrCount * tNoOfOperations * tAttributeSize + opCount * tAttributeSize;
|
|
tmp = MyOperations[tableCount]->
|
|
getValue((char*)attrName[attrCount + 1], (char*)&(readValue[Index]));
|
|
|
|
if (tmp == NULL) {
|
|
tResult = 9;
|
|
break;
|
|
} // if
|
|
} // for attrCount
|
|
} // for tableCount
|
|
// Execute transaction reading one tuple in every table
|
|
check = MyTransaction->execute(Commit);
|
|
if (check == -1) {
|
|
ndbout << MyTransaction->getNdbError().message << endl;
|
|
|
|
// Add complete error handling here
|
|
|
|
int retCode = flexScanErrorData->handleErrorCommon(MyTransaction->getNdbError());
|
|
if (retCode == 1) {
|
|
if (MyTransaction->getNdbError().code != 626 && MyTransaction->getNdbError().code != 630){
|
|
ndbout_c("execute: %d, %s", opCount, MyTransaction ->getNdbError().message );
|
|
ndbout_c("Error code = %d", MyTransaction->getNdbError().code );}
|
|
tResult = 20;
|
|
} else if (retCode == 2) {
|
|
ndbout << "4115 should not happen in flexBench" << endl;
|
|
tResult = 20;
|
|
} else if (retCode == 3) {
|
|
// --------------------------------------------------------------------
|
|
// We are not certain if the transaction was successful or not.
|
|
// We must reexecute but might very well find that the transaction
|
|
// actually was updated. Updates and Reads are no problem here. Inserts
|
|
// will not cause a problem if error code 630 arrives. Deletes will
|
|
// not cause a problem if 626 arrives.
|
|
// --------------------------------------------------------------------
|
|
/* What can we do here? */
|
|
ndbout_c("execute: %s", MyTransaction ->getNdbError().message );
|
|
}//if(retCode == 3)
|
|
|
|
} // if
|
|
|
|
pNdb->closeTransaction(MyTransaction);
|
|
} // else
|
|
} // for opCount
|
|
|
|
return(tResult);
|
|
} // readRows
|
|
|
|
static int scanReadRows(Ndb* pNdb, int* readValue)
|
|
{
|
|
int tResult = 0;
|
|
int tableCount = 0;
|
|
int attrCount = 0;
|
|
int check = 0;
|
|
int countAbort = 0; // Counts loops until scan abort if requested
|
|
NdbConnection* MyTransaction = NULL;
|
|
NdbOperation* MyOperation = NULL;
|
|
NdbRecAttr* tmp = NULL;
|
|
|
|
|
|
for (tableCount = 0; tableCount < tNoOfTables; tableCount++) {
|
|
MyTransaction = pNdb->startTransaction();
|
|
if (MyTransaction == NULL) {
|
|
tResult = 1;
|
|
break;
|
|
} // if
|
|
MyOperation = MyTransaction->getNdbOperation(tableName[tableCount]);
|
|
if (MyOperation == NULL) {
|
|
tResult = 2;
|
|
break;
|
|
} // if
|
|
|
|
check = MyOperation->openScanRead(tParallellism);
|
|
if (check == -1) {
|
|
tResult = 10;
|
|
break;
|
|
} // if
|
|
|
|
for (int attrCount = 0; attrCount < tNoOfAttributes-1; attrCount++) {
|
|
// Get all attributes
|
|
tmp = MyOperation->
|
|
getValue((char*)attrName[attrCount+1],
|
|
(char*)&(readValue[tableCount*(tNoOfAttributes-1)*tNoOfOperations*tAttributeSize +
|
|
attrCount*tNoOfOperations*tAttributeSize]));
|
|
if (tmp == NULL) {
|
|
tResult = 9;
|
|
break;
|
|
} // if
|
|
} // for attrCount
|
|
|
|
check = MyTransaction->executeScan();
|
|
if (check == -1) {
|
|
tResult = 12;
|
|
break;
|
|
} // if
|
|
|
|
check = MyTransaction->nextScanResult();
|
|
while (check == 0) {
|
|
// Check if scan abort is requested
|
|
if (theScanAbortTestFlag == 1) {
|
|
if (countAbort == tAbortAfter) {
|
|
MyTransaction->stopScan();
|
|
ndbout << "scanread aborted on request after " << countAbort*tParallellism <<
|
|
" tuples" << endl;
|
|
break; // break while loop
|
|
} // if
|
|
countAbort++;
|
|
} // if
|
|
check = MyTransaction->nextScanResult();
|
|
} // while
|
|
|
|
pNdb->closeTransaction(MyTransaction);
|
|
} // for tableCount
|
|
|
|
return(tResult);
|
|
} // scanReadRows
|
|
|
|
static int scanUpdateRows(Ndb* pNdb,
|
|
int* readValue,
|
|
int* attrValue)
|
|
{
|
|
int tResult = 0;
|
|
int tableCount = 0;
|
|
int attrCount = 0;
|
|
int check = 0;
|
|
int opCount = 0;
|
|
NdbConnection* MyTransaction = NULL;
|
|
NdbOperation* MyOperation = NULL;
|
|
NdbConnection* MyTakeOverTrans = NULL;
|
|
NdbOperation* MyTakeOverOp = NULL;
|
|
NdbRecAttr* tTmp = NULL;
|
|
|
|
for (tableCount = 0; tableCount < tNoOfTables; tableCount++) {
|
|
MyTransaction = pNdb->startTransaction();
|
|
if (MyTransaction == NULL) {
|
|
tResult = 1;
|
|
break; // break tableCount for loop
|
|
} // if
|
|
MyOperation = MyTransaction->getNdbOperation(tableName[tableCount]);
|
|
if (MyOperation == NULL) {
|
|
tResult = 2;
|
|
break;
|
|
} // if
|
|
|
|
check = MyOperation->openScanExclusive(tParallellism);
|
|
if (check == -1) {
|
|
tResult = 11;
|
|
break;
|
|
} // if
|
|
|
|
MyOperation->interpret_exit_ok();
|
|
// Fetch all attributes
|
|
for (int attrCount = 0; attrCount < tNoOfAttributes-1; attrCount++) {
|
|
tTmp = MyOperation->
|
|
getValue((char*)attrName[attrCount+1],
|
|
(char*)&(readValue[tableCount*(tNoOfAttributes-1)*tNoOfOperations*tAttributeSize +
|
|
attrCount*tNoOfOperations*tAttributeSize]));
|
|
if (tTmp == NULL) {
|
|
tResult = 9;
|
|
break; // break for loop
|
|
} // if
|
|
} // for
|
|
if (tResult != 0) {
|
|
break; // break while loop also
|
|
} // if
|
|
|
|
check = MyTransaction->executeScan();
|
|
if (check == -1) {
|
|
tResult = 12;
|
|
break;
|
|
} // if
|
|
check = MyTransaction->nextScanResult();
|
|
opCount = 0;
|
|
while (check == 0) {
|
|
MyTakeOverTrans = pNdb->startTransaction();
|
|
MyTakeOverOp = MyOperation->takeOverForUpdate(MyTakeOverTrans);
|
|
for (attrCount = 0; attrCount < tNoOfAttributes-1; attrCount++) {
|
|
check = MyTakeOverOp->setValue((char*)attrName[attrCount+1],
|
|
(char*)&(attrValue[tableCount*(tNoOfAttributes-1)*tNoOfOperations*tAttributeSize +
|
|
attrCount*tNoOfOperations*tAttributeSize + opCount*tAttributeSize]));
|
|
} // for
|
|
|
|
check = MyTakeOverTrans->execute(Commit);
|
|
if (check == 0) {
|
|
check = MyTransaction->nextScanResult();
|
|
opCount++;
|
|
} // if
|
|
else {
|
|
tResult = 95;
|
|
|
|
/* MyTransaction, MyTakeOverTrans, Which one? */
|
|
|
|
// Any further error handling?
|
|
int retCode = flexScanErrorData->handleErrorCommon(MyTakeOverTrans->getNdbError());
|
|
if (retCode == 1) {
|
|
if (MyTakeOverTrans->getNdbError().code != 626 && MyTakeOverTrans->getNdbError().code != 630){
|
|
ndbout_c("execute: %s", MyTakeOverTrans->getNdbError().message);
|
|
ndbout_c("Error code = %d", MyTakeOverTrans->getNdbError().code);}
|
|
tResult = 20;
|
|
} else if (retCode == 2) {
|
|
ndbout << "4115 should not happen in flexBench" << endl;
|
|
tResult = 20;
|
|
} else if (retCode == 3) {
|
|
// --------------------------------------------------------------------
|
|
// We are not certain if the transaction was successful or not.
|
|
// We must reexecute but might very well find that the transaction
|
|
// actually was updated. Updates and Reads are no problem here. Inserts
|
|
// will not cause a problem if error code 630 arrives. Deletes will
|
|
// not cause a problem if 626 arrives.
|
|
// --------------------------------------------------------------------
|
|
/* What can we do here? */
|
|
ndbout_c("execute: %s", MyTakeOverTrans->getNdbError().message);
|
|
}//if(retCode == 3)
|
|
|
|
} // else
|
|
pNdb->closeTransaction(MyTakeOverTrans);
|
|
} // while
|
|
|
|
pNdb->closeTransaction(MyTransaction);
|
|
} // for
|
|
|
|
return(tResult);
|
|
} // scanUpdateRows
|
|
|
|
static int scanDeleteRows(Ndb* pNdb, int* readValue)
|
|
{
|
|
int tResult = 0;
|
|
int tableCount = 0;
|
|
int attrCount = 0;
|
|
int check = 0;
|
|
NdbRecAttr* tTmp = NULL;
|
|
NdbConnection* MyTransaction = NULL;
|
|
NdbOperation* MyOperation = NULL;
|
|
NdbConnection* MyTakeOverTrans = NULL;
|
|
NdbOperation* MyTakeOverOp = NULL;
|
|
|
|
for (tableCount = 0; tableCount < tNoOfTables; tableCount++) {
|
|
MyTransaction = pNdb->startTransaction();
|
|
if (MyTransaction == NULL) {
|
|
tResult = 1;
|
|
break; // break tableCount for loop
|
|
} // if
|
|
|
|
MyOperation = MyTransaction->getNdbOperation(tableName[tableCount]);
|
|
if (MyOperation == NULL) {
|
|
tResult = 2;
|
|
break;
|
|
} // if
|
|
|
|
check = MyOperation->openScanExclusive(tParallellism);
|
|
if (check == -1) {
|
|
tResult = 11;
|
|
break;
|
|
} // if
|
|
|
|
MyOperation->interpret_exit_ok();
|
|
for (int attrCount = 0; attrCount < tNoOfAttributes-1; attrCount++) {
|
|
tTmp = MyOperation->
|
|
getValue((char*)attrName[attrCount+1],
|
|
(char*)&(readValue[tableCount*(tNoOfAttributes-1)*tNoOfOperations +
|
|
attrCount*tNoOfOperations]));
|
|
if (tTmp == NULL) {
|
|
tResult = 9;
|
|
break;
|
|
} // if
|
|
} // for
|
|
|
|
check = MyTransaction->executeScan();
|
|
if (check == -1) {
|
|
tResult = 12;
|
|
break;
|
|
} // if
|
|
check = MyTransaction->nextScanResult();
|
|
while (check == 0) {
|
|
MyTakeOverTrans = pNdb->startTransaction();
|
|
MyTakeOverOp = MyOperation->takeOverForDelete(MyTakeOverTrans);
|
|
check = MyTakeOverOp->deleteTuple();
|
|
|
|
check = MyTakeOverTrans->execute(Commit);
|
|
|
|
//Error handling here
|
|
|
|
int retCode =flexScanErrorData->handleErrorCommon(MyTakeOverTrans->getNdbError());
|
|
if (retCode == 1) {
|
|
if (MyTakeOverTrans->getNdbError().code != 626 && MyTakeOverTrans->getNdbError().code != 630){
|
|
ndbout_c("execute: %s", MyTakeOverTrans->getNdbError().message );
|
|
ndbout_c("Error code = %d", MyTakeOverTrans->getNdbError().code );}
|
|
tResult = 20;
|
|
} else if (retCode == 2) {
|
|
ndbout << "4115 should not happen in flexBench" << endl;
|
|
tResult = 20;
|
|
} else if (retCode == 3) {
|
|
// --------------------------------------------------------------------
|
|
// We are not certain if the transaction was successful or not.
|
|
// We must reexecute but might very well find that the transaction
|
|
// actually was updated. Updates and Reads are no problem here. Inserts
|
|
// will not cause a problem if error code 630 arrives. Deletes will
|
|
// not cause a problem if 626 arrives.
|
|
// --------------------------------------------------------------------
|
|
/* What can we do here? */
|
|
ndbout_c("execute: %s", MyTakeOverTrans->getNdbError().message );
|
|
}//if(retCode == 3) End of error handling
|
|
|
|
pNdb->closeTransaction(MyTakeOverTrans);
|
|
check = MyTransaction->nextScanResult();
|
|
} // while
|
|
pNdb->closeTransaction(MyTransaction);
|
|
} // for tableCount
|
|
return(tResult);
|
|
} // scanDeleteRows
|
|
|
|
static int deleteRows(Ndb* pNdb,
|
|
int* pkValue)
|
|
{
|
|
int tResult = 0;
|
|
NdbConnection* MyTransaction = NULL;
|
|
int tableCount = 0;
|
|
int opCount = 0;
|
|
int check = 0;
|
|
NdbOperation* MyOperations[MAXTABLES] = {NULL};
|
|
|
|
for (opCount = 0; opCount < tNoOfOperations; opCount++) {
|
|
MyTransaction = pNdb->startTransaction();
|
|
if (MyTransaction == NULL) {
|
|
tResult = 1;
|
|
} // if
|
|
else {
|
|
for (tableCount = 0; tableCount < tNoOfTables; tableCount++) {
|
|
|
|
MyOperations[tableCount] =
|
|
MyTransaction->getNdbOperation(tableName[tableCount]);
|
|
if (MyOperations[tableCount] == NULL) {
|
|
tResult = 2;
|
|
// Break for tableCount loop
|
|
break;
|
|
} // if
|
|
|
|
check = MyOperations[tableCount]->deleteTuple();
|
|
if (check == -1) {
|
|
tResult = 3;
|
|
break;
|
|
} // if
|
|
|
|
check = MyOperations[tableCount]->
|
|
equal((char*)attrName[0], (char*)&(pkValue[opCount]));
|
|
if (check == -1) {
|
|
tResult = 7;
|
|
break;
|
|
} // if
|
|
|
|
} // for tableCount
|
|
|
|
// Execute transaction deleting one tuple in every table
|
|
check = MyTransaction->execute(Commit);
|
|
if (check == -1) {
|
|
ndbout << MyTransaction->getNdbError().message << endl;
|
|
// Add complete error handling here
|
|
|
|
int retCode = flexScanErrorData->handleErrorCommon(MyTransaction->getNdbError());
|
|
if (retCode == 1) {
|
|
if (MyTransaction->getNdbError().code != 626 && MyTransaction->getNdbError().code != 630){
|
|
ndbout_c("execute: %d, %s", opCount, MyTransaction->getNdbError().message );
|
|
ndbout_c("Error code = %d", MyTransaction->getNdbError().code );}
|
|
tResult = 20;
|
|
} else if (retCode == 2) {
|
|
ndbout << "4115 should not happen in flexBench" << endl;
|
|
tResult = 20;
|
|
} else if (retCode == 3) {
|
|
// --------------------------------------------------------------------
|
|
// We are not certain if the transaction was successful or not.
|
|
// We must reexecute but might very well find that the transaction
|
|
// actually was updated. Updates and Reads are no problem here. Inserts
|
|
// will not cause a problem if error code 630 arrives. Deletes will
|
|
// not cause a problem if 626 arrives.
|
|
// --------------------------------------------------------------------
|
|
/* What can we do here? */
|
|
ndbout_c("execute: %s", MyTransaction->getNdbError().message );
|
|
}//if(retCode == 3)
|
|
|
|
} // if
|
|
|
|
pNdb->closeTransaction(MyTransaction);
|
|
} // else
|
|
} // for opCount
|
|
|
|
return(tResult);
|
|
|
|
} // deleteRows
|
|
|
|
////////////////////////////////////////
|
|
//
|
|
// Name: verifyDeleteRows
|
|
//
|
|
// Purpose: Verifies that all tables are empty by reading every tuple
|
|
// No deletions made here
|
|
//
|
|
// Returns: 'Standard' error codes
|
|
//
|
|
/////////////////////////////////////
|
|
static int verifyDeleteRows(Ndb* pNdb,
|
|
int* pkValue,
|
|
int* readValue)
|
|
{
|
|
int tResult = 0;
|
|
int tableCount = 0;
|
|
int attrCount = 0;
|
|
int check = 0;
|
|
NdbConnection* MyTransaction = NULL;
|
|
NdbOperation* MyOperations = NULL;
|
|
NdbRecAttr* tmp = NULL;
|
|
int Value = 0;
|
|
int Index = 0;
|
|
int opCount = 0;
|
|
|
|
for (opCount = 0; opCount < tNoOfOperations; opCount++) {
|
|
for (tableCount = 0; tableCount < tNoOfTables; tableCount++) {
|
|
MyTransaction = pNdb->startTransaction();
|
|
if (MyTransaction == NULL) {
|
|
tResult = 1;
|
|
} // if
|
|
else {
|
|
|
|
MyOperations =
|
|
MyTransaction->getNdbOperation(tableName[tableCount]);
|
|
if (MyOperations == NULL) {
|
|
tResult = 2;
|
|
// Break for tableCount loop
|
|
break;
|
|
} // if
|
|
|
|
check = MyOperations->readTuple();
|
|
if (check == -1) {
|
|
tResult = 3;
|
|
break;
|
|
} // if
|
|
|
|
check = MyOperations->
|
|
equal((char*)attrName[0], (char*)&(pkValue[opCount]));
|
|
if (check == -1) {
|
|
tResult = 7;
|
|
break;
|
|
} // if
|
|
|
|
for (int attrCount = 0; attrCount < tNoOfAttributes - 1; attrCount++) {
|
|
Index = tableCount * (tNoOfAttributes - 1) * tNoOfOperations * tAttributeSize +
|
|
attrCount * tNoOfOperations * tAttributeSize + opCount * tAttributeSize;
|
|
tmp = MyOperations->
|
|
getValue((char*)attrName[attrCount + 1], (char*)&(readValue[Index]));
|
|
|
|
if (tmp == NULL) {
|
|
tResult = 9;
|
|
break;
|
|
} // if
|
|
} // for attrCount
|
|
// Execute transaction reading one tuple in every table
|
|
check = MyTransaction->execute(Commit);
|
|
if ((check == -1) && (MyTransaction->getNdbError().code == 626)){
|
|
// This is expected because everything should be deleted
|
|
} // if
|
|
else if (check == 0) {
|
|
// We have found a tuple that should have been deleted
|
|
ndbout << "tuple " << tableName[tableCount] << ":" <<
|
|
opCount << " was never deleted" << endl;
|
|
tResult = 97;
|
|
} // else if
|
|
else {
|
|
// Unexpected error
|
|
ndbout << "Unexpected error during delete" << endl;
|
|
assert(false);
|
|
} // else
|
|
|
|
pNdb->closeTransaction(MyTransaction);
|
|
|
|
} // else
|
|
} // for tableCount
|
|
} // for opCount
|
|
|
|
return(tResult);
|
|
} // verifyDeleteRows
|