mirror of
https://github.com/MariaDB/server.git
synced 2025-01-25 00:04:33 +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
1961 lines
52 KiB
C++
1961 lines
52 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 */
|
|
|
|
/*
|
|
* testBlobs
|
|
*/
|
|
|
|
#include <ndb_global.h>
|
|
#include <NdbMain.h>
|
|
#include <NdbOut.hpp>
|
|
#include <NdbTest.hpp>
|
|
#include <NdbTick.h>
|
|
|
|
struct Bcol {
|
|
bool m_nullable;
|
|
unsigned m_inline;
|
|
unsigned m_partsize;
|
|
unsigned m_stripe;
|
|
char m_btname[200];
|
|
Bcol(bool a, unsigned b, unsigned c, unsigned d) :
|
|
m_nullable(a),
|
|
m_inline(b),
|
|
m_partsize(c),
|
|
m_stripe(d)
|
|
{}
|
|
};
|
|
|
|
struct Opt {
|
|
unsigned m_batch;
|
|
bool m_core;
|
|
bool m_dbg;
|
|
bool m_dbgall;
|
|
const char* m_dbug;
|
|
bool m_fac;
|
|
bool m_full;
|
|
unsigned m_loop;
|
|
unsigned m_parts;
|
|
unsigned m_rows;
|
|
unsigned m_seed;
|
|
const char* m_skip;
|
|
const char* m_test;
|
|
// metadata
|
|
const char* m_tname;
|
|
const char* m_x1name; // hash index
|
|
const char* m_x2name; // ordered index
|
|
unsigned m_pk1off;
|
|
unsigned m_pk2len;
|
|
bool m_oneblob;
|
|
Bcol m_blob1;
|
|
Bcol m_blob2;
|
|
// perf
|
|
const char* m_tnameperf;
|
|
unsigned m_rowsperf;
|
|
// bugs
|
|
int m_bug;
|
|
int (*m_bugtest)();
|
|
Opt() :
|
|
m_batch(7),
|
|
m_core(false),
|
|
m_dbg(false),
|
|
m_dbgall(false),
|
|
m_dbug(0),
|
|
m_fac(false),
|
|
m_full(false),
|
|
m_loop(1),
|
|
m_parts(10),
|
|
m_rows(100),
|
|
m_seed(0),
|
|
m_skip(0),
|
|
m_test(0),
|
|
// metadata
|
|
m_tname("TBLOB1"),
|
|
m_x1name("TBLOB1X1"),
|
|
m_x2name("TBLOB1X2"),
|
|
m_pk1off(0x12340000),
|
|
m_pk2len(55),
|
|
m_oneblob(false),
|
|
m_blob1(false, 7, 1137, 10),
|
|
m_blob2(true, 99, 55, 1),
|
|
// perf
|
|
m_tnameperf("TBLOB2"),
|
|
m_rowsperf(10000),
|
|
// bugs
|
|
m_bug(0),
|
|
m_bugtest(0) {
|
|
}
|
|
};
|
|
|
|
static const unsigned g_max_pk2len = 256;
|
|
|
|
static void
|
|
printusage()
|
|
{
|
|
Opt d;
|
|
ndbout
|
|
<< "usage: testBlobs options [default/max]" << endl
|
|
<< " -batch N number of pk ops in batch [" << d.m_batch << "]" << endl
|
|
<< " -core dump core on error" << endl
|
|
<< " -dbg print debug" << endl
|
|
<< " -dbgall print also NDB API debug (if compiled in)" << endl
|
|
<< " -dbug opt dbug options" << endl
|
|
<< " -fac fetch across commit in scan delete [" << d.m_fac << "]" << endl
|
|
<< " -full read/write only full blob values" << endl
|
|
<< " -loop N loop N times 0=forever [" << d.m_loop << "]" << endl
|
|
<< " -parts N max parts in blob value [" << d.m_parts << "]" << endl
|
|
<< " -rows N number of rows [" << d.m_rows << "]" << endl
|
|
<< " -rowsperf N rows for performace test [" << d.m_rowsperf << "]" << endl
|
|
<< " -seed N random seed 0=loop number [" << d.m_seed << "]" << endl
|
|
<< " -skip xxx skip given tests (see list) [no tests]" << endl
|
|
<< " -test xxx only given tests (see list) [all tests]" << endl
|
|
<< "metadata" << endl
|
|
<< " -pk2len N length of PK2 [" << d.m_pk2len << "/" << g_max_pk2len <<"]" << endl
|
|
<< " -oneblob only 1 blob attribute [default 2]" << endl
|
|
<< "testcases for test/skip" << endl
|
|
<< " k primary key ops" << endl
|
|
<< " i hash index ops" << endl
|
|
<< " s table scans" << endl
|
|
<< " r ordered index scans" << endl
|
|
<< " p performance test" << endl
|
|
<< "additional flags for test/skip" << endl
|
|
<< " u update existing blob value" << endl
|
|
<< " n normal insert and update" << endl
|
|
<< " w insert and update using writeTuple" << endl
|
|
<< " 0 getValue / setValue" << endl
|
|
<< " 1 setActiveHook" << endl
|
|
<< " 2 readData / writeData" << endl
|
|
<< "bug tests (no blob test)" << endl
|
|
<< " -bug 4088 ndb api hang with mixed ops on index table" << endl
|
|
<< " -bug nnnn delete + write gives 626" << endl
|
|
<< " -bug nnnn acc crash on delete and long key" << endl
|
|
;
|
|
}
|
|
|
|
static Opt g_opt;
|
|
|
|
static bool
|
|
testcase(char x)
|
|
{
|
|
if (x < 10)
|
|
x += '0';
|
|
return
|
|
(g_opt.m_test == 0 || strchr(g_opt.m_test, x) != 0) &&
|
|
(g_opt.m_skip == 0 || strchr(g_opt.m_skip, x) == 0);
|
|
}
|
|
|
|
static Ndb_cluster_connection* g_ncc = 0;
|
|
static Ndb* g_ndb = 0;
|
|
static NdbDictionary::Dictionary* g_dic = 0;
|
|
static NdbConnection* g_con = 0;
|
|
static NdbOperation* g_opr = 0;
|
|
static NdbIndexOperation* g_opx = 0;
|
|
static NdbScanOperation* g_ops = 0;
|
|
static NdbBlob* g_bh1 = 0;
|
|
static NdbBlob* g_bh2 = 0;
|
|
static bool g_printerror = true;
|
|
static unsigned g_loop = 0;
|
|
|
|
static void
|
|
printerror(int line, const char* msg)
|
|
{
|
|
ndbout << "line " << line << " FAIL " << msg << endl;
|
|
if (! g_printerror) {
|
|
return;
|
|
}
|
|
if (g_ndb != 0 && g_ndb->getNdbError().code != 0) {
|
|
ndbout << "ndb: " << g_ndb->getNdbError() << endl;
|
|
}
|
|
if (g_dic != 0 && g_dic->getNdbError().code != 0) {
|
|
ndbout << "dic: " << g_dic->getNdbError() << endl;
|
|
}
|
|
if (g_con != 0 && g_con->getNdbError().code != 0) {
|
|
ndbout << "con: " << g_con->getNdbError() << endl;
|
|
if (g_opr != 0 && g_opr->getNdbError().code != 0) {
|
|
ndbout << "opr: table=" << g_opr->getTableName() << " " << g_opr->getNdbError() << endl;
|
|
}
|
|
if (g_opx != 0 && g_opx->getNdbError().code != 0) {
|
|
ndbout << "opx: table=" << g_opx->getTableName() << " " << g_opx->getNdbError() << endl;
|
|
}
|
|
if (g_ops != 0 && g_ops->getNdbError().code != 0) {
|
|
ndbout << "ops: table=" << g_ops->getTableName() << " " << g_ops->getNdbError() << endl;
|
|
}
|
|
NdbOperation* ope = g_con->getNdbErrorOperation();
|
|
if (ope != 0 && ope->getNdbError().code != 0) {
|
|
if (ope != g_opr && ope != g_opx && ope != g_ops)
|
|
ndbout << "ope: table=" << ope->getTableName() << " " << ope->getNdbError() << endl;
|
|
}
|
|
}
|
|
if (g_bh1 != 0 && g_bh1->getNdbError().code != 0) {
|
|
ndbout << "bh1: " << g_bh1->getNdbError() << endl;
|
|
}
|
|
if (g_bh2 != 0 && g_bh2->getNdbError().code != 0) {
|
|
ndbout << "bh2: " << g_bh2->getNdbError() << endl;
|
|
}
|
|
if (g_opt.m_core) {
|
|
abort();
|
|
}
|
|
g_printerror = false;
|
|
}
|
|
|
|
#define CHK(x) \
|
|
do { \
|
|
if (x) break; \
|
|
printerror(__LINE__, #x); return -1; \
|
|
} while (0)
|
|
#define DBG(x) \
|
|
do { \
|
|
if (! g_opt.m_dbg) break; \
|
|
ndbout << "line " << __LINE__ << " " << x << endl; \
|
|
} while (0)
|
|
|
|
static int
|
|
dropTable()
|
|
{
|
|
NdbDictionary::Table tab(g_opt.m_tname);
|
|
if (g_dic->getTable(g_opt.m_tname) != 0)
|
|
CHK(g_dic->dropTable(g_opt.m_tname) == 0);
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
createTable()
|
|
{
|
|
NdbDictionary::Table tab(g_opt.m_tname);
|
|
tab.setLogging(false);
|
|
// col PK1 - Uint32
|
|
{ NdbDictionary::Column col("PK1");
|
|
col.setType(NdbDictionary::Column::Unsigned);
|
|
col.setPrimaryKey(true);
|
|
tab.addColumn(col);
|
|
}
|
|
// col BL1 - Blob not-nullable
|
|
{ NdbDictionary::Column col("BL1");
|
|
const Bcol& b = g_opt.m_blob1;
|
|
col.setType(NdbDictionary::Column::Blob);
|
|
col.setInlineSize(b.m_inline);
|
|
col.setPartSize(b.m_partsize);
|
|
col.setStripeSize(b.m_stripe);
|
|
tab.addColumn(col);
|
|
}
|
|
// col PK2 - Char[55]
|
|
if (g_opt.m_pk2len != 0)
|
|
{ NdbDictionary::Column col("PK2");
|
|
col.setType(NdbDictionary::Column::Char);
|
|
col.setLength(g_opt.m_pk2len);
|
|
col.setPrimaryKey(true);
|
|
tab.addColumn(col);
|
|
}
|
|
// col BL2 - Text nullable
|
|
if (! g_opt.m_oneblob)
|
|
{ NdbDictionary::Column col("BL2");
|
|
const Bcol& b = g_opt.m_blob2;
|
|
col.setType(NdbDictionary::Column::Text);
|
|
col.setNullable(true);
|
|
col.setInlineSize(b.m_inline);
|
|
col.setPartSize(b.m_partsize);
|
|
col.setStripeSize(b.m_stripe);
|
|
tab.addColumn(col);
|
|
}
|
|
// create table
|
|
CHK(g_dic->createTable(tab) == 0);
|
|
// unique hash index on PK2
|
|
if (g_opt.m_pk2len != 0)
|
|
{ NdbDictionary::Index idx(g_opt.m_x1name);
|
|
idx.setType(NdbDictionary::Index::UniqueHashIndex);
|
|
idx.setLogging(false);
|
|
idx.setTable(g_opt.m_tname);
|
|
idx.addColumnName("PK2");
|
|
CHK(g_dic->createIndex(idx) == 0);
|
|
}
|
|
// ordered index on PK2
|
|
if (g_opt.m_pk2len != 0)
|
|
{ NdbDictionary::Index idx(g_opt.m_x2name);
|
|
idx.setType(NdbDictionary::Index::OrderedIndex);
|
|
idx.setLogging(false);
|
|
idx.setTable(g_opt.m_tname);
|
|
idx.addColumnName("PK2");
|
|
CHK(g_dic->createIndex(idx) == 0);
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
// tuples
|
|
|
|
struct Bval {
|
|
char* m_val;
|
|
unsigned m_len;
|
|
char* m_buf; // read/write buffer
|
|
unsigned m_buflen;
|
|
int m_error_code; // for testing expected error code
|
|
Bval() :
|
|
m_val(0),
|
|
m_len(0),
|
|
m_buf(0),
|
|
m_buflen(0),
|
|
m_error_code(0)
|
|
{}
|
|
~Bval() { delete [] m_val; delete [] m_buf; }
|
|
void alloc(unsigned buflen) {
|
|
m_buflen = buflen;
|
|
delete [] m_buf;
|
|
m_buf = new char [m_buflen];
|
|
trash();
|
|
}
|
|
void copyfrom(const Bval& v) {
|
|
m_len = v.m_len;
|
|
delete [] m_val;
|
|
if (v.m_val == 0)
|
|
m_val = 0;
|
|
else
|
|
m_val = (char*)memcpy(new char [m_len], v.m_val, m_len);
|
|
}
|
|
void trash() const {
|
|
assert(m_buf != 0);
|
|
memset(m_buf, 'x', m_buflen);
|
|
}
|
|
private:
|
|
Bval(const Bval&);
|
|
Bval& operator=(const Bval&);
|
|
};
|
|
|
|
struct Tup {
|
|
bool m_exists; // exists in table
|
|
Uint32 m_pk1; // primary keys concatenated like keyinfo
|
|
char m_pk2[g_max_pk2len + 1];
|
|
Bval m_blob1;
|
|
Bval m_blob2;
|
|
Tup() :
|
|
m_exists(false)
|
|
{}
|
|
~Tup() { }
|
|
// alloc buffers of max size
|
|
void alloc() {
|
|
m_blob1.alloc(g_opt.m_blob1.m_inline + g_opt.m_blob1.m_partsize * g_opt.m_parts);
|
|
m_blob2.alloc(g_opt.m_blob2.m_inline + g_opt.m_blob2.m_partsize * g_opt.m_parts);
|
|
}
|
|
void copyfrom(const Tup& tup) {
|
|
assert(m_pk1 == tup.m_pk1);
|
|
m_blob1.copyfrom(tup.m_blob1);
|
|
m_blob2.copyfrom(tup.m_blob2);
|
|
}
|
|
private:
|
|
Tup(const Tup&);
|
|
Tup& operator=(const Tup&);
|
|
};
|
|
|
|
static Tup* g_tups;
|
|
|
|
static unsigned
|
|
urandom(unsigned n)
|
|
{
|
|
return n == 0 ? 0 : random() % n;
|
|
}
|
|
|
|
static void
|
|
calcBval(const Bcol& b, Bval& v, bool keepsize)
|
|
{
|
|
if (b.m_nullable && urandom(10) == 0) {
|
|
v.m_len = 0;
|
|
delete [] v.m_val;
|
|
v.m_val = 0;
|
|
v.m_buf = new char [1];
|
|
} else {
|
|
if (keepsize && v.m_val != 0)
|
|
;
|
|
else if (urandom(10) == 0)
|
|
v.m_len = urandom(b.m_inline);
|
|
else
|
|
v.m_len = urandom(b.m_inline + g_opt.m_parts * b.m_partsize + 1);
|
|
delete [] v.m_val;
|
|
v.m_val = new char [v.m_len + 1];
|
|
for (unsigned i = 0; i < v.m_len; i++)
|
|
v.m_val[i] = 'a' + urandom(25);
|
|
v.m_val[v.m_len] = 0;
|
|
v.m_buf = new char [v.m_len];
|
|
}
|
|
v.m_buflen = v.m_len;
|
|
v.trash();
|
|
}
|
|
|
|
static void
|
|
calcBval(Tup& tup, bool keepsize)
|
|
{
|
|
calcBval(g_opt.m_blob1, tup.m_blob1, keepsize);
|
|
if (! g_opt.m_oneblob)
|
|
calcBval(g_opt.m_blob2, tup.m_blob2, keepsize);
|
|
}
|
|
|
|
static void
|
|
calcTups(bool keepsize)
|
|
{
|
|
for (unsigned k = 0; k < g_opt.m_rows; k++) {
|
|
Tup& tup = g_tups[k];
|
|
tup.m_pk1 = g_opt.m_pk1off + k;
|
|
for (unsigned i = 0, n = k; i < g_opt.m_pk2len; i++) {
|
|
if (n != 0) {
|
|
tup.m_pk2[i] = '0' + n % 10;
|
|
n = n / 10;
|
|
} else {
|
|
tup.m_pk2[i] = 'a' + i % 26;
|
|
}
|
|
}
|
|
calcBval(tup, keepsize);
|
|
}
|
|
}
|
|
|
|
// blob handle ops
|
|
|
|
static int
|
|
getBlobHandles(NdbOperation* opr)
|
|
{
|
|
CHK((g_bh1 = opr->getBlobHandle("BL1")) != 0);
|
|
if (! g_opt.m_oneblob)
|
|
CHK((g_bh2 = opr->getBlobHandle("BL2")) != 0);
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
getBlobHandles(NdbIndexOperation* opx)
|
|
{
|
|
CHK((g_bh1 = opx->getBlobHandle("BL1")) != 0);
|
|
if (! g_opt.m_oneblob)
|
|
CHK((g_bh2 = opx->getBlobHandle("BL2")) != 0);
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
getBlobHandles(NdbScanOperation* ops)
|
|
{
|
|
CHK((g_bh1 = ops->getBlobHandle("BL1")) != 0);
|
|
if (! g_opt.m_oneblob)
|
|
CHK((g_bh2 = ops->getBlobHandle("BL2")) != 0);
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
getBlobLength(NdbBlob* h, unsigned& len)
|
|
{
|
|
Uint64 len2 = (unsigned)-1;
|
|
CHK(h->getLength(len2) == 0);
|
|
len = (unsigned)len2;
|
|
assert(len == len2);
|
|
bool isNull;
|
|
CHK(h->getNull(isNull) == 0);
|
|
DBG("getBlobLength " << h->getColumn()->getName() << " len=" << len << " null=" << isNull);
|
|
return 0;
|
|
}
|
|
|
|
// setValue / getValue
|
|
|
|
static int
|
|
setBlobValue(NdbBlob* h, const Bval& v, int error_code = 0)
|
|
{
|
|
bool null = (v.m_val == 0);
|
|
bool isNull;
|
|
unsigned len;
|
|
DBG("setValue " << h->getColumn()->getName() << " len=" << v.m_len << " null=" << null);
|
|
if (null) {
|
|
CHK(h->setNull() == 0 || h->getNdbError().code == error_code);
|
|
if (error_code)
|
|
return 0;
|
|
isNull = false;
|
|
CHK(h->getNull(isNull) == 0 && isNull == true);
|
|
CHK(getBlobLength(h, len) == 0 && len == 0);
|
|
} else {
|
|
CHK(h->setValue(v.m_val, v.m_len) == 0 || h->getNdbError().code == error_code);
|
|
if (error_code)
|
|
return 0;
|
|
CHK(h->getNull(isNull) == 0 && isNull == false);
|
|
CHK(getBlobLength(h, len) == 0 && len == v.m_len);
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
setBlobValue(const Tup& tup, int error_code = 0)
|
|
{
|
|
CHK(setBlobValue(g_bh1, tup.m_blob1, error_code) == 0);
|
|
if (! g_opt.m_oneblob)
|
|
CHK(setBlobValue(g_bh2, tup.m_blob2, error_code) == 0);
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
getBlobValue(NdbBlob* h, const Bval& v)
|
|
{
|
|
bool null = (v.m_val == 0);
|
|
DBG("getValue " << h->getColumn()->getName() << " buflen=" << v.m_buflen);
|
|
CHK(h->getValue(v.m_buf, v.m_buflen) == 0);
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
getBlobValue(const Tup& tup)
|
|
{
|
|
CHK(getBlobValue(g_bh1, tup.m_blob1) == 0);
|
|
if (! g_opt.m_oneblob)
|
|
CHK(getBlobValue(g_bh2, tup.m_blob2) == 0);
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
verifyBlobValue(NdbBlob* h, const Bval& v)
|
|
{
|
|
bool null = (v.m_val == 0);
|
|
bool isNull;
|
|
unsigned len;
|
|
if (null) {
|
|
isNull = false;
|
|
CHK(h->getNull(isNull) == 0 && isNull == true);
|
|
CHK(getBlobLength(h, len) == 0 && len == 0);
|
|
} else {
|
|
isNull = true;
|
|
CHK(h->getNull(isNull) == 0 && isNull == false);
|
|
CHK(getBlobLength(h, len) == 0 && len == v.m_len);
|
|
for (unsigned i = 0; i < v.m_len; i++)
|
|
CHK(v.m_val[i] == v.m_buf[i]);
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
verifyBlobValue(const Tup& tup)
|
|
{
|
|
CHK(verifyBlobValue(g_bh1, tup.m_blob1) == 0);
|
|
if (! g_opt.m_oneblob)
|
|
CHK(verifyBlobValue(g_bh2, tup.m_blob2) == 0);
|
|
return 0;
|
|
}
|
|
|
|
// readData / writeData
|
|
|
|
static int
|
|
writeBlobData(NdbBlob* h, const Bval& v)
|
|
{
|
|
bool null = (v.m_val == 0);
|
|
bool isNull;
|
|
unsigned len;
|
|
DBG("write " << h->getColumn()->getName() << " len=" << v.m_len << " null=" << null);
|
|
int error_code = v.m_error_code;
|
|
if (null) {
|
|
CHK(h->setNull() == 0 || h->getNdbError().code == error_code);
|
|
if (error_code)
|
|
return 0;
|
|
isNull = false;
|
|
CHK(h->getNull(isNull) == 0 && isNull == true);
|
|
CHK(getBlobLength(h, len) == 0 && len == 0);
|
|
} else {
|
|
CHK(h->truncate(v.m_len) == 0 || h->getNdbError().code == error_code);
|
|
if (error_code)
|
|
return 0;
|
|
unsigned n = 0;
|
|
do {
|
|
unsigned m = g_opt.m_full ? v.m_len : urandom(v.m_len + 1);
|
|
if (m > v.m_len - n)
|
|
m = v.m_len - n;
|
|
DBG("write pos=" << n << " cnt=" << m);
|
|
CHK(h->writeData(v.m_val + n, m) == 0);
|
|
n += m;
|
|
} while (n < v.m_len);
|
|
assert(n == v.m_len);
|
|
isNull = true;
|
|
CHK(h->getNull(isNull) == 0 && isNull == false);
|
|
CHK(getBlobLength(h, len) == 0 && len == v.m_len);
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
writeBlobData(Tup& tup, int error_code = 0)
|
|
{
|
|
tup.m_blob1.m_error_code = error_code;
|
|
CHK(writeBlobData(g_bh1, tup.m_blob1) == 0);
|
|
if (! g_opt.m_oneblob) {
|
|
tup.m_blob2.m_error_code = error_code;
|
|
CHK(writeBlobData(g_bh2, tup.m_blob2) == 0);
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
readBlobData(NdbBlob* h, const Bval& v)
|
|
{
|
|
bool null = (v.m_val == 0);
|
|
bool isNull;
|
|
unsigned len;
|
|
DBG("read " << h->getColumn()->getName() << " len=" << v.m_len << " null=" << null);
|
|
if (null) {
|
|
isNull = false;
|
|
CHK(h->getNull(isNull) == 0 && isNull == true);
|
|
CHK(getBlobLength(h, len) == 0 && len == 0);
|
|
} else {
|
|
isNull = true;
|
|
CHK(h->getNull(isNull) == 0 && isNull == false);
|
|
CHK(getBlobLength(h, len) == 0 && len == v.m_len);
|
|
v.trash();
|
|
unsigned n = 0;
|
|
while (n < v.m_len) {
|
|
unsigned m = g_opt.m_full ? v.m_len : urandom(v.m_len + 1);
|
|
if (m > v.m_len - n)
|
|
m = v.m_len - n;
|
|
DBG("read pos=" << n << " cnt=" << m);
|
|
const unsigned m2 = m;
|
|
CHK(h->readData(v.m_buf + n, m) == 0);
|
|
CHK(m2 == m);
|
|
n += m;
|
|
}
|
|
assert(n == v.m_len);
|
|
// need to execute to see the data
|
|
CHK(g_con->execute(NoCommit) == 0);
|
|
for (unsigned i = 0; i < v.m_len; i++)
|
|
CHK(v.m_val[i] == v.m_buf[i]);
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
readBlobData(const Tup& tup)
|
|
{
|
|
CHK(readBlobData(g_bh1, tup.m_blob1) == 0);
|
|
if (! g_opt.m_oneblob)
|
|
CHK(readBlobData(g_bh2, tup.m_blob2) == 0);
|
|
return 0;
|
|
}
|
|
|
|
// hooks
|
|
|
|
static NdbBlob::ActiveHook blobWriteHook;
|
|
|
|
static int
|
|
blobWriteHook(NdbBlob* h, void* arg)
|
|
{
|
|
DBG("blobWriteHook");
|
|
Bval& v = *(Bval*)arg;
|
|
CHK(writeBlobData(h, v) == 0);
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
setBlobWriteHook(NdbBlob* h, Bval& v, int error_code = 0)
|
|
{
|
|
DBG("setBlobWriteHook");
|
|
v.m_error_code = error_code;
|
|
CHK(h->setActiveHook(blobWriteHook, &v) == 0);
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
setBlobWriteHook(Tup& tup, int error_code = 0)
|
|
{
|
|
CHK(setBlobWriteHook(g_bh1, tup.m_blob1, error_code) == 0);
|
|
if (! g_opt.m_oneblob)
|
|
CHK(setBlobWriteHook(g_bh2, tup.m_blob2, error_code) == 0);
|
|
return 0;
|
|
}
|
|
|
|
static NdbBlob::ActiveHook blobReadHook;
|
|
|
|
// no PK yet to identify tuple so just read the value
|
|
static int
|
|
blobReadHook(NdbBlob* h, void* arg)
|
|
{
|
|
DBG("blobReadHook");
|
|
Bval& v = *(Bval*)arg;
|
|
unsigned len;
|
|
CHK(getBlobLength(h, len) == 0);
|
|
v.alloc(len);
|
|
Uint32 maxlen = 0xffffffff;
|
|
CHK(h->readData(v.m_buf, maxlen) == 0);
|
|
DBG("read " << maxlen << " bytes");
|
|
CHK(len == maxlen);
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
setBlobReadHook(NdbBlob* h, Bval& v)
|
|
{
|
|
DBG("setBlobReadHook");
|
|
CHK(h->setActiveHook(blobReadHook, &v) == 0);
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
setBlobReadHook(Tup& tup)
|
|
{
|
|
CHK(setBlobReadHook(g_bh1, tup.m_blob1) == 0);
|
|
if (! g_opt.m_oneblob)
|
|
CHK(setBlobReadHook(g_bh2, tup.m_blob2) == 0);
|
|
return 0;
|
|
}
|
|
|
|
// verify blob data
|
|
|
|
static int
|
|
verifyHeadInline(const Bcol& c, const Bval& v, NdbRecAttr* ra)
|
|
{
|
|
if (v.m_val == 0) {
|
|
CHK(ra->isNULL() == 1);
|
|
} else {
|
|
CHK(ra->isNULL() == 0);
|
|
const NdbBlob::Head* head = (const NdbBlob::Head*)ra->aRef();
|
|
CHK(head->length == v.m_len);
|
|
const char* data = (const char*)(head + 1);
|
|
for (unsigned i = 0; i < head->length && i < c.m_inline; i++)
|
|
CHK(data[i] == v.m_val[i]);
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
verifyHeadInline(const Tup& tup)
|
|
{
|
|
DBG("verifyHeadInline pk1=" << hex << tup.m_pk1);
|
|
CHK((g_con = g_ndb->startTransaction()) != 0);
|
|
CHK((g_opr = g_con->getNdbOperation(g_opt.m_tname)) != 0);
|
|
CHK(g_opr->readTuple() == 0);
|
|
CHK(g_opr->equal("PK1", tup.m_pk1) == 0);
|
|
if (g_opt.m_pk2len != 0)
|
|
CHK(g_opr->equal("PK2", tup.m_pk2) == 0);
|
|
NdbRecAttr* ra1;
|
|
NdbRecAttr* ra2;
|
|
CHK((ra1 = g_opr->getValue("BL1")) != 0);
|
|
if (! g_opt.m_oneblob)
|
|
CHK((ra2 = g_opr->getValue("BL2")) != 0);
|
|
if (tup.m_exists) {
|
|
CHK(g_con->execute(Commit) == 0);
|
|
DBG("verifyHeadInline BL1");
|
|
CHK(verifyHeadInline(g_opt.m_blob1, tup.m_blob1, ra1) == 0);
|
|
if (! g_opt.m_oneblob) {
|
|
DBG("verifyHeadInline BL2");
|
|
CHK(verifyHeadInline(g_opt.m_blob2, tup.m_blob2, ra2) == 0);
|
|
}
|
|
} else {
|
|
CHK(g_con->execute(Commit) == -1 && g_con->getNdbError().code == 626);
|
|
}
|
|
g_ndb->closeTransaction(g_con);
|
|
g_opr = 0;
|
|
g_con = 0;
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
verifyBlobTable(const Bcol& b, const Bval& v, Uint32 pk1, bool exists)
|
|
{
|
|
DBG("verify " << b.m_btname << " pk1=" << hex << pk1);
|
|
NdbRecAttr* ra_pk;
|
|
NdbRecAttr* ra_part;
|
|
NdbRecAttr* ra_data;
|
|
CHK((g_con = g_ndb->startTransaction()) != 0);
|
|
CHK((g_ops = g_con->getNdbScanOperation(b.m_btname)) != 0);
|
|
CHK(g_ops->readTuples() == 0);
|
|
CHK((ra_pk = g_ops->getValue("PK")) != 0);
|
|
CHK((ra_part = g_ops->getValue("PART")) != 0);
|
|
CHK((ra_data = g_ops->getValue("DATA")) != 0);
|
|
CHK(g_con->execute(NoCommit) == 0);
|
|
unsigned partcount;
|
|
if (! exists || v.m_len <= b.m_inline)
|
|
partcount = 0;
|
|
else
|
|
partcount = (v.m_len - b.m_inline + b.m_partsize - 1) / b.m_partsize;
|
|
char* seen = new char [partcount];
|
|
memset(seen, 0, partcount);
|
|
while (1) {
|
|
int ret;
|
|
CHK((ret = g_ops->nextResult()) == 0 || ret == 1);
|
|
if (ret == 1)
|
|
break;
|
|
if (pk1 != ra_pk->u_32_value())
|
|
continue;
|
|
Uint32 part = ra_part->u_32_value();
|
|
DBG("part " << part << " of " << partcount);
|
|
const char* data = ra_data->aRef();
|
|
CHK(part < partcount && ! seen[part]);
|
|
seen[part] = 1;
|
|
unsigned n = b.m_inline + part * b.m_partsize;
|
|
assert(exists && v.m_val != 0 && n < v.m_len);
|
|
unsigned m = v.m_len - n;
|
|
if (m > b.m_partsize)
|
|
m = b.m_partsize;
|
|
CHK(memcmp(data, v.m_val + n, m) == 0);
|
|
}
|
|
for (unsigned i = 0; i < partcount; i++)
|
|
CHK(seen[i] == 1);
|
|
g_ndb->closeTransaction(g_con);
|
|
g_ops = 0;
|
|
g_con = 0;
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
verifyBlobTable(const Tup& tup)
|
|
{
|
|
CHK(verifyBlobTable(g_opt.m_blob1, tup.m_blob1, tup.m_pk1, tup.m_exists) == 0);
|
|
if (! g_opt.m_oneblob)
|
|
CHK(verifyBlobTable(g_opt.m_blob2, tup.m_blob2, tup.m_pk1, tup.m_exists) == 0);
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
verifyBlob()
|
|
{
|
|
for (unsigned k = 0; k < g_opt.m_rows; k++) {
|
|
const Tup& tup = g_tups[k];
|
|
DBG("verifyBlob pk1=" << hex << tup.m_pk1);
|
|
CHK(verifyHeadInline(tup) == 0);
|
|
CHK(verifyBlobTable(tup) == 0);
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
// operations
|
|
|
|
static const char* stylename[3] = {
|
|
"style=getValue/setValue",
|
|
"style=setActiveHook",
|
|
"style=readData/writeData"
|
|
};
|
|
|
|
// pk ops
|
|
|
|
static int
|
|
insertPk(int style)
|
|
{
|
|
DBG("--- insertPk " << stylename[style] << " ---");
|
|
unsigned n = 0;
|
|
CHK((g_con = g_ndb->startTransaction()) != 0);
|
|
for (unsigned k = 0; k < g_opt.m_rows; k++) {
|
|
Tup& tup = g_tups[k];
|
|
DBG("insertPk pk1=" << hex << tup.m_pk1);
|
|
CHK((g_opr = g_con->getNdbOperation(g_opt.m_tname)) != 0);
|
|
CHK(g_opr->insertTuple() == 0);
|
|
CHK(g_opr->equal("PK1", tup.m_pk1) == 0);
|
|
if (g_opt.m_pk2len != 0)
|
|
CHK(g_opr->equal("PK2", tup.m_pk2) == 0);
|
|
CHK(getBlobHandles(g_opr) == 0);
|
|
if (style == 0) {
|
|
CHK(setBlobValue(tup) == 0);
|
|
} else if (style == 1) {
|
|
// non-nullable must be set
|
|
CHK(g_bh1->setValue("", 0) == 0);
|
|
CHK(setBlobWriteHook(tup) == 0);
|
|
} else {
|
|
// non-nullable must be set
|
|
CHK(g_bh1->setValue("", 0) == 0);
|
|
CHK(g_con->execute(NoCommit) == 0);
|
|
CHK(writeBlobData(tup) == 0);
|
|
}
|
|
if (++n == g_opt.m_batch) {
|
|
CHK(g_con->execute(Commit) == 0);
|
|
g_ndb->closeTransaction(g_con);
|
|
CHK((g_con = g_ndb->startTransaction()) != 0);
|
|
n = 0;
|
|
}
|
|
g_opr = 0;
|
|
tup.m_exists = true;
|
|
}
|
|
if (n != 0) {
|
|
CHK(g_con->execute(Commit) == 0);
|
|
n = 0;
|
|
}
|
|
g_ndb->closeTransaction(g_con);
|
|
g_con = 0;
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
readPk(int style)
|
|
{
|
|
DBG("--- readPk " << stylename[style] << " ---");
|
|
for (unsigned k = 0; k < g_opt.m_rows; k++) {
|
|
Tup& tup = g_tups[k];
|
|
DBG("readPk pk1=" << hex << tup.m_pk1);
|
|
CHK((g_con = g_ndb->startTransaction()) != 0);
|
|
CHK((g_opr = g_con->getNdbOperation(g_opt.m_tname)) != 0);
|
|
if (urandom(2) == 0)
|
|
CHK(g_opr->readTuple() == 0);
|
|
else
|
|
CHK(g_opr->readTuple(NdbOperation::LM_CommittedRead) == 0);
|
|
CHK(g_opr->equal("PK1", tup.m_pk1) == 0);
|
|
if (g_opt.m_pk2len != 0)
|
|
CHK(g_opr->equal("PK2", tup.m_pk2) == 0);
|
|
CHK(getBlobHandles(g_opr) == 0);
|
|
if (style == 0) {
|
|
CHK(getBlobValue(tup) == 0);
|
|
} else if (style == 1) {
|
|
CHK(setBlobReadHook(tup) == 0);
|
|
} else {
|
|
CHK(g_con->execute(NoCommit) == 0);
|
|
CHK(readBlobData(tup) == 0);
|
|
}
|
|
CHK(g_con->execute(Commit) == 0);
|
|
// verify lock mode upgrade
|
|
CHK(g_opr->getLockMode() == NdbOperation::LM_Read);
|
|
if (style == 0 || style == 1) {
|
|
CHK(verifyBlobValue(tup) == 0);
|
|
}
|
|
g_ndb->closeTransaction(g_con);
|
|
g_opr = 0;
|
|
g_con = 0;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
updatePk(int style)
|
|
{
|
|
DBG("--- updatePk " << stylename[style] << " ---");
|
|
for (unsigned k = 0; k < g_opt.m_rows; k++) {
|
|
Tup& tup = g_tups[k];
|
|
DBG("updatePk pk1=" << hex << tup.m_pk1);
|
|
while (1) {
|
|
int mode = urandom(3);
|
|
int error_code = mode == 0 ? 0 : 4275;
|
|
CHK((g_con = g_ndb->startTransaction()) != 0);
|
|
CHK((g_opr = g_con->getNdbOperation(g_opt.m_tname)) != 0);
|
|
if (mode == 0) {
|
|
DBG("using updateTuple");
|
|
CHK(g_opr->updateTuple() == 0);
|
|
} else if (mode == 1) {
|
|
DBG("using readTuple exclusive");
|
|
CHK(g_opr->readTuple(NdbOperation::LM_Exclusive) == 0);
|
|
} else {
|
|
DBG("using readTuple - will fail and retry");
|
|
CHK(g_opr->readTuple() == 0);
|
|
}
|
|
CHK(g_opr->equal("PK1", tup.m_pk1) == 0);
|
|
if (g_opt.m_pk2len != 0)
|
|
CHK(g_opr->equal("PK2", tup.m_pk2) == 0);
|
|
CHK(getBlobHandles(g_opr) == 0);
|
|
if (style == 0) {
|
|
CHK(setBlobValue(tup, error_code) == 0);
|
|
} else if (style == 1) {
|
|
CHK(setBlobWriteHook(tup, error_code) == 0);
|
|
} else {
|
|
CHK(g_con->execute(NoCommit) == 0);
|
|
CHK(writeBlobData(tup, error_code) == 0);
|
|
}
|
|
if (error_code == 0) {
|
|
CHK(g_con->execute(Commit) == 0);
|
|
g_ndb->closeTransaction(g_con);
|
|
break;
|
|
}
|
|
g_ndb->closeTransaction(g_con);
|
|
}
|
|
g_opr = 0;
|
|
g_con = 0;
|
|
tup.m_exists = true;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
writePk(int style)
|
|
{
|
|
DBG("--- writePk " << stylename[style] << " ---");
|
|
for (unsigned k = 0; k < g_opt.m_rows; k++) {
|
|
Tup& tup = g_tups[k];
|
|
DBG("writePk pk1=" << hex << tup.m_pk1);
|
|
CHK((g_con = g_ndb->startTransaction()) != 0);
|
|
CHK((g_opr = g_con->getNdbOperation(g_opt.m_tname)) != 0);
|
|
CHK(g_opr->writeTuple() == 0);
|
|
CHK(g_opr->equal("PK1", tup.m_pk1) == 0);
|
|
if (g_opt.m_pk2len != 0)
|
|
CHK(g_opr->equal("PK2", tup.m_pk2) == 0);
|
|
CHK(getBlobHandles(g_opr) == 0);
|
|
if (style == 0) {
|
|
CHK(setBlobValue(tup) == 0);
|
|
} else if (style == 1) {
|
|
// non-nullable must be set
|
|
CHK(g_bh1->setValue("", 0) == 0);
|
|
CHK(setBlobWriteHook(tup) == 0);
|
|
} else {
|
|
// non-nullable must be set
|
|
CHK(g_bh1->setValue("", 0) == 0);
|
|
CHK(g_con->execute(NoCommit) == 0);
|
|
CHK(writeBlobData(tup) == 0);
|
|
}
|
|
CHK(g_con->execute(Commit) == 0);
|
|
g_ndb->closeTransaction(g_con);
|
|
g_opr = 0;
|
|
g_con = 0;
|
|
tup.m_exists = true;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
deletePk()
|
|
{
|
|
DBG("--- deletePk ---");
|
|
unsigned n = 0;
|
|
CHK((g_con = g_ndb->startTransaction()) != 0);
|
|
for (unsigned k = 0; k < g_opt.m_rows; k++) {
|
|
Tup& tup = g_tups[k];
|
|
DBG("deletePk pk1=" << hex << tup.m_pk1);
|
|
CHK((g_opr = g_con->getNdbOperation(g_opt.m_tname)) != 0);
|
|
CHK(g_opr->deleteTuple() == 0);
|
|
CHK(g_opr->equal("PK1", tup.m_pk1) == 0);
|
|
if (g_opt.m_pk2len != 0)
|
|
CHK(g_opr->equal("PK2", tup.m_pk2) == 0);
|
|
if (++n == g_opt.m_batch) {
|
|
CHK(g_con->execute(Commit) == 0);
|
|
g_ndb->closeTransaction(g_con);
|
|
CHK((g_con = g_ndb->startTransaction()) != 0);
|
|
n = 0;
|
|
}
|
|
g_opr = 0;
|
|
tup.m_exists = false;
|
|
}
|
|
if (n != 0) {
|
|
CHK(g_con->execute(Commit) == 0);
|
|
n = 0;
|
|
}
|
|
g_ndb->closeTransaction(g_con);
|
|
g_con = 0;
|
|
return 0;
|
|
}
|
|
|
|
// hash index ops
|
|
|
|
static int
|
|
readIdx(int style)
|
|
{
|
|
DBG("--- readIdx " << stylename[style] << " ---");
|
|
for (unsigned k = 0; k < g_opt.m_rows; k++) {
|
|
Tup& tup = g_tups[k];
|
|
DBG("readIdx pk1=" << hex << tup.m_pk1);
|
|
CHK((g_con = g_ndb->startTransaction()) != 0);
|
|
CHK((g_opx = g_con->getNdbIndexOperation(g_opt.m_x1name, g_opt.m_tname)) != 0);
|
|
if (urandom(2) == 0)
|
|
CHK(g_opx->readTuple() == 0);
|
|
else
|
|
CHK(g_opx->readTuple(NdbOperation::LM_CommittedRead) == 0);
|
|
CHK(g_opx->equal("PK2", tup.m_pk2) == 0);
|
|
CHK(getBlobHandles(g_opx) == 0);
|
|
if (style == 0) {
|
|
CHK(getBlobValue(tup) == 0);
|
|
} else if (style == 1) {
|
|
CHK(setBlobReadHook(tup) == 0);
|
|
} else {
|
|
CHK(g_con->execute(NoCommit) == 0);
|
|
CHK(readBlobData(tup) == 0);
|
|
}
|
|
CHK(g_con->execute(Commit) == 0);
|
|
// verify lock mode upgrade (already done by NdbIndexOperation)
|
|
CHK(g_opx->getLockMode() == NdbOperation::LM_Read);
|
|
if (style == 0 || style == 1) {
|
|
CHK(verifyBlobValue(tup) == 0);
|
|
}
|
|
g_ndb->closeTransaction(g_con);
|
|
g_opx = 0;
|
|
g_con = 0;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
updateIdx(int style)
|
|
{
|
|
DBG("--- updateIdx " << stylename[style] << " ---");
|
|
for (unsigned k = 0; k < g_opt.m_rows; k++) {
|
|
Tup& tup = g_tups[k];
|
|
DBG("updateIdx pk1=" << hex << tup.m_pk1);
|
|
// skip 4275 testing
|
|
CHK((g_con = g_ndb->startTransaction()) != 0);
|
|
CHK((g_opx = g_con->getNdbIndexOperation(g_opt.m_x1name, g_opt.m_tname)) != 0);
|
|
CHK(g_opx->updateTuple() == 0);
|
|
CHK(g_opx->equal("PK2", tup.m_pk2) == 0);
|
|
CHK(getBlobHandles(g_opx) == 0);
|
|
if (style == 0) {
|
|
CHK(setBlobValue(tup) == 0);
|
|
} else if (style == 1) {
|
|
CHK(setBlobWriteHook(tup) == 0);
|
|
} else {
|
|
CHK(g_con->execute(NoCommit) == 0);
|
|
CHK(writeBlobData(tup) == 0);
|
|
}
|
|
CHK(g_con->execute(Commit) == 0);
|
|
g_ndb->closeTransaction(g_con);
|
|
g_opx = 0;
|
|
g_con = 0;
|
|
tup.m_exists = true;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
writeIdx(int style)
|
|
{
|
|
DBG("--- writeIdx " << stylename[style] << " ---");
|
|
for (unsigned k = 0; k < g_opt.m_rows; k++) {
|
|
Tup& tup = g_tups[k];
|
|
DBG("writeIdx pk1=" << hex << tup.m_pk1);
|
|
CHK((g_con = g_ndb->startTransaction()) != 0);
|
|
CHK((g_opx = g_con->getNdbIndexOperation(g_opt.m_x1name, g_opt.m_tname)) != 0);
|
|
CHK(g_opx->writeTuple() == 0);
|
|
CHK(g_opx->equal("PK2", tup.m_pk2) == 0);
|
|
CHK(getBlobHandles(g_opx) == 0);
|
|
if (style == 0) {
|
|
CHK(setBlobValue(tup) == 0);
|
|
} else if (style == 1) {
|
|
// non-nullable must be set
|
|
CHK(g_bh1->setValue("", 0) == 0);
|
|
CHK(setBlobWriteHook(tup) == 0);
|
|
} else {
|
|
// non-nullable must be set
|
|
CHK(g_bh1->setValue("", 0) == 0);
|
|
CHK(g_con->execute(NoCommit) == 0);
|
|
CHK(writeBlobData(tup) == 0);
|
|
}
|
|
CHK(g_con->execute(Commit) == 0);
|
|
g_ndb->closeTransaction(g_con);
|
|
g_opx = 0;
|
|
g_con = 0;
|
|
tup.m_exists = true;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
deleteIdx()
|
|
{
|
|
DBG("--- deleteIdx ---");
|
|
unsigned n = 0;
|
|
CHK((g_con = g_ndb->startTransaction()) != 0);
|
|
for (unsigned k = 0; k < g_opt.m_rows; k++) {
|
|
Tup& tup = g_tups[k];
|
|
DBG("deleteIdx pk1=" << hex << tup.m_pk1);
|
|
CHK((g_opx = g_con->getNdbIndexOperation(g_opt.m_x1name, g_opt.m_tname)) != 0);
|
|
CHK(g_opx->deleteTuple() == 0);
|
|
CHK(g_opx->equal("PK2", tup.m_pk2) == 0);
|
|
if (++n == g_opt.m_batch) {
|
|
CHK(g_con->execute(Commit) == 0);
|
|
g_ndb->closeTransaction(g_con);
|
|
CHK((g_con = g_ndb->startTransaction()) != 0);
|
|
n = 0;
|
|
}
|
|
g_opx = 0;
|
|
tup.m_exists = false;
|
|
}
|
|
if (n != 0) {
|
|
CHK(g_con->execute(Commit) == 0);
|
|
n = 0;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
// scan ops table and index
|
|
|
|
static int
|
|
readScan(int style, bool idx)
|
|
{
|
|
DBG("--- " << "readScan" << (idx ? "Idx" : "") << " " << stylename[style] << " ---");
|
|
Tup tup;
|
|
tup.alloc(); // allocate buffers
|
|
CHK((g_con = g_ndb->startTransaction()) != 0);
|
|
if (! idx) {
|
|
CHK((g_ops = g_con->getNdbScanOperation(g_opt.m_tname)) != 0);
|
|
} else {
|
|
CHK((g_ops = g_con->getNdbIndexScanOperation(g_opt.m_x2name, g_opt.m_tname)) != 0);
|
|
}
|
|
if (urandom(2) == 0)
|
|
CHK(g_ops->readTuples(NdbOperation::LM_Read) == 0);
|
|
else
|
|
CHK(g_ops->readTuples(NdbOperation::LM_CommittedRead) == 0);
|
|
CHK(g_ops->getValue("PK1", (char*)&tup.m_pk1) != 0);
|
|
if (g_opt.m_pk2len != 0)
|
|
CHK(g_ops->getValue("PK2", tup.m_pk2) != 0);
|
|
CHK(getBlobHandles(g_ops) == 0);
|
|
if (style == 0) {
|
|
CHK(getBlobValue(tup) == 0);
|
|
} else if (style == 1) {
|
|
CHK(setBlobReadHook(tup) == 0);
|
|
}
|
|
CHK(g_con->execute(NoCommit) == 0);
|
|
// verify lock mode upgrade
|
|
CHK(g_ops->getLockMode() == NdbOperation::LM_Read);
|
|
unsigned rows = 0;
|
|
while (1) {
|
|
int ret;
|
|
tup.m_pk1 = (Uint32)-1;
|
|
memset(tup.m_pk2, 'x', g_opt.m_pk2len);
|
|
CHK((ret = g_ops->nextResult(true)) == 0 || ret == 1);
|
|
if (ret == 1)
|
|
break;
|
|
DBG("readScan" << (idx ? "Idx" : "") << " pk1=" << hex << tup.m_pk1);
|
|
Uint32 k = tup.m_pk1 - g_opt.m_pk1off;
|
|
CHK(k < g_opt.m_rows && g_tups[k].m_exists);
|
|
tup.copyfrom(g_tups[k]);
|
|
if (style == 0) {
|
|
CHK(verifyBlobValue(tup) == 0);
|
|
} else if (style == 1) {
|
|
// execute ops generated by callbacks, if any
|
|
CHK(verifyBlobValue(tup) == 0);
|
|
} else {
|
|
CHK(readBlobData(tup) == 0);
|
|
}
|
|
rows++;
|
|
}
|
|
g_ndb->closeTransaction(g_con);
|
|
g_con = 0;
|
|
g_ops = 0;
|
|
CHK(g_opt.m_rows == rows);
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
updateScan(int style, bool idx)
|
|
{
|
|
DBG("--- " << "updateScan" << (idx ? "Idx" : "") << " " << stylename[style] << " ---");
|
|
Tup tup;
|
|
tup.alloc(); // allocate buffers
|
|
CHK((g_con = g_ndb->startTransaction()) != 0);
|
|
if (! idx) {
|
|
CHK((g_ops = g_con->getNdbScanOperation(g_opt.m_tname)) != 0);
|
|
} else {
|
|
CHK((g_ops = g_con->getNdbIndexScanOperation(g_opt.m_x2name, g_opt.m_tname)) != 0);
|
|
}
|
|
CHK(g_ops->readTuples(NdbOperation::LM_Exclusive) == 0);
|
|
CHK(g_ops->getValue("PK1", (char*)&tup.m_pk1) != 0);
|
|
if (g_opt.m_pk2len != 0)
|
|
CHK(g_ops->getValue("PK2", tup.m_pk2) != 0);
|
|
CHK(g_con->execute(NoCommit) == 0);
|
|
unsigned rows = 0;
|
|
while (1) {
|
|
int ret;
|
|
tup.m_pk1 = (Uint32)-1;
|
|
memset(tup.m_pk2, 'x', g_opt.m_pk2len);
|
|
CHK((ret = g_ops->nextResult(true)) == 0 || ret == 1);
|
|
if (ret == 1)
|
|
break;
|
|
DBG("updateScan" << (idx ? "Idx" : "") << " pk1=" << hex << tup.m_pk1);
|
|
Uint32 k = tup.m_pk1 - g_opt.m_pk1off;
|
|
CHK(k < g_opt.m_rows && g_tups[k].m_exists);
|
|
// calculate new blob values
|
|
calcBval(g_tups[k], false);
|
|
tup.copyfrom(g_tups[k]);
|
|
// cannot do 4275 testing, scan op error code controls execution
|
|
CHK((g_opr = g_ops->updateCurrentTuple()) != 0);
|
|
CHK(getBlobHandles(g_opr) == 0);
|
|
if (style == 0) {
|
|
CHK(setBlobValue(tup) == 0);
|
|
} else if (style == 1) {
|
|
CHK(setBlobWriteHook(tup) == 0);
|
|
} else {
|
|
CHK(g_con->execute(NoCommit) == 0);
|
|
CHK(writeBlobData(tup) == 0);
|
|
}
|
|
CHK(g_con->execute(NoCommit) == 0);
|
|
g_opr = 0;
|
|
rows++;
|
|
}
|
|
CHK(g_con->execute(Commit) == 0);
|
|
g_ndb->closeTransaction(g_con);
|
|
g_con = 0;
|
|
g_ops = 0;
|
|
CHK(g_opt.m_rows == rows);
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
deleteScan(bool idx)
|
|
{
|
|
DBG("--- " << "deleteScan" << (idx ? "Idx" : "") << " ---");
|
|
Tup tup;
|
|
CHK((g_con = g_ndb->startTransaction()) != 0);
|
|
if (! idx) {
|
|
CHK((g_ops = g_con->getNdbScanOperation(g_opt.m_tname)) != 0);
|
|
} else {
|
|
CHK((g_ops = g_con->getNdbIndexScanOperation(g_opt.m_x2name, g_opt.m_tname)) != 0);
|
|
}
|
|
CHK(g_ops->readTuples(NdbOperation::LM_Exclusive) == 0);
|
|
CHK(g_ops->getValue("PK1", (char*)&tup.m_pk1) != 0);
|
|
if (g_opt.m_pk2len != 0)
|
|
CHK(g_ops->getValue("PK2", tup.m_pk2) != 0);
|
|
CHK(g_con->execute(NoCommit) == 0);
|
|
unsigned rows = 0;
|
|
unsigned n = 0;
|
|
while (1) {
|
|
int ret;
|
|
tup.m_pk1 = (Uint32)-1;
|
|
memset(tup.m_pk2, 'x', g_opt.m_pk2len);
|
|
CHK((ret = g_ops->nextResult(true)) == 0 || ret == 1);
|
|
if (ret == 1)
|
|
break;
|
|
while (1) {
|
|
DBG("deleteScan" << (idx ? "Idx" : "") << " pk1=" << hex << tup.m_pk1);
|
|
Uint32 k = tup.m_pk1 - g_opt.m_pk1off;
|
|
CHK(k < g_opt.m_rows && g_tups[k].m_exists);
|
|
g_tups[k].m_exists = false;
|
|
CHK(g_ops->deleteCurrentTuple() == 0);
|
|
rows++;
|
|
tup.m_pk1 = (Uint32)-1;
|
|
memset(tup.m_pk2, 'x', g_opt.m_pk2len);
|
|
CHK((ret = g_ops->nextResult(false)) == 0 || ret == 1 || ret == 2);
|
|
if (++n == g_opt.m_batch || ret == 2) {
|
|
DBG("execute batch: n=" << n << " ret=" << ret);
|
|
if (! g_opt.m_fac) {
|
|
CHK(g_con->execute(NoCommit) == 0);
|
|
} else {
|
|
CHK(g_con->execute(Commit) == 0);
|
|
CHK(g_con->restart() == 0);
|
|
}
|
|
n = 0;
|
|
}
|
|
if (ret == 2)
|
|
break;
|
|
}
|
|
}
|
|
CHK(g_con->execute(Commit) == 0);
|
|
g_ndb->closeTransaction(g_con);
|
|
g_con = 0;
|
|
g_ops = 0;
|
|
CHK(g_opt.m_rows == rows);
|
|
return 0;
|
|
}
|
|
|
|
// main
|
|
|
|
// from here on print always
|
|
#undef DBG
|
|
#define DBG(x) \
|
|
do { \
|
|
ndbout << "line " << __LINE__ << " " << x << endl; \
|
|
} while (0)
|
|
|
|
static int
|
|
testmain()
|
|
{
|
|
g_ndb = new Ndb(g_ncc, "TEST_DB");
|
|
CHK(g_ndb->init(20) == 0);
|
|
CHK(g_ndb->waitUntilReady() == 0);
|
|
g_dic = g_ndb->getDictionary();
|
|
g_tups = new Tup [g_opt.m_rows];
|
|
CHK(dropTable() == 0);
|
|
CHK(createTable() == 0);
|
|
if (g_opt.m_bugtest != 0) {
|
|
// test a general bug instead of blobs
|
|
CHK((*g_opt.m_bugtest)() == 0);
|
|
return 0;
|
|
}
|
|
Bcol& b1 = g_opt.m_blob1;
|
|
CHK(NdbBlob::getBlobTableName(b1.m_btname, g_ndb, g_opt.m_tname, "BL1") == 0);
|
|
DBG("BL1: inline=" << b1.m_inline << " part=" << b1.m_partsize << " table=" << b1.m_btname);
|
|
if (! g_opt.m_oneblob) {
|
|
Bcol& b2 = g_opt.m_blob2;
|
|
CHK(NdbBlob::getBlobTableName(b2.m_btname, g_ndb, g_opt.m_tname, "BL2") == 0);
|
|
DBG("BL2: inline=" << b2.m_inline << " part=" << b2.m_partsize << " table=" << b2.m_btname);
|
|
}
|
|
if (g_opt.m_seed != 0)
|
|
srandom(g_opt.m_seed);
|
|
for (g_loop = 0; g_opt.m_loop == 0 || g_loop < g_opt.m_loop; g_loop++) {
|
|
int style;
|
|
DBG("=== loop " << g_loop << " ===");
|
|
if (g_opt.m_seed == 0)
|
|
srandom(g_loop);
|
|
// pk
|
|
for (style = 0; style <= 2; style++) {
|
|
if (! testcase('k') || ! testcase(style))
|
|
continue;
|
|
DBG("--- pk ops " << stylename[style] << " ---");
|
|
if (testcase('n')) {
|
|
calcTups(false);
|
|
CHK(insertPk(style) == 0);
|
|
CHK(verifyBlob() == 0);
|
|
CHK(readPk(style) == 0);
|
|
if (testcase('u')) {
|
|
calcTups(style);
|
|
CHK(updatePk(style) == 0);
|
|
CHK(verifyBlob() == 0);
|
|
CHK(readPk(style) == 0);
|
|
}
|
|
CHK(deletePk() == 0);
|
|
CHK(verifyBlob() == 0);
|
|
}
|
|
if (testcase('w')) {
|
|
calcTups(false);
|
|
CHK(writePk(style) == 0);
|
|
CHK(verifyBlob() == 0);
|
|
CHK(readPk(style) == 0);
|
|
if (testcase('u')) {
|
|
calcTups(style);
|
|
CHK(writePk(style) == 0);
|
|
CHK(verifyBlob() == 0);
|
|
CHK(readPk(style) == 0);
|
|
}
|
|
CHK(deletePk() == 0);
|
|
CHK(verifyBlob() == 0);
|
|
}
|
|
}
|
|
// hash index
|
|
for (style = 0; style <= 2; style++) {
|
|
if (! testcase('i') || ! testcase(style))
|
|
continue;
|
|
DBG("--- idx ops " << stylename[style] << " ---");
|
|
if (testcase('n')) {
|
|
calcTups(false);
|
|
CHK(insertPk(style) == 0);
|
|
CHK(verifyBlob() == 0);
|
|
CHK(readIdx(style) == 0);
|
|
if (testcase('u')) {
|
|
calcTups(style);
|
|
CHK(updateIdx(style) == 0);
|
|
CHK(verifyBlob() == 0);
|
|
CHK(readIdx(style) == 0);
|
|
}
|
|
CHK(deleteIdx() == 0);
|
|
CHK(verifyBlob() == 0);
|
|
}
|
|
if (testcase('w')) {
|
|
calcTups(false);
|
|
CHK(writePk(style) == 0);
|
|
CHK(verifyBlob() == 0);
|
|
CHK(readIdx(style) == 0);
|
|
if (testcase('u')) {
|
|
calcTups(style);
|
|
CHK(writeIdx(style) == 0);
|
|
CHK(verifyBlob() == 0);
|
|
CHK(readIdx(style) == 0);
|
|
}
|
|
CHK(deleteIdx() == 0);
|
|
CHK(verifyBlob() == 0);
|
|
}
|
|
}
|
|
// scan table
|
|
for (style = 0; style <= 2; style++) {
|
|
if (! testcase('s') || ! testcase(style))
|
|
continue;
|
|
DBG("--- table scan " << stylename[style] << " ---");
|
|
calcTups(false);
|
|
CHK(insertPk(style) == 0);
|
|
CHK(verifyBlob() == 0);
|
|
CHK(readScan(style, false) == 0);
|
|
if (testcase('u')) {
|
|
CHK(updateScan(style, false) == 0);
|
|
CHK(verifyBlob() == 0);
|
|
}
|
|
CHK(deleteScan(false) == 0);
|
|
CHK(verifyBlob() == 0);
|
|
}
|
|
// scan index
|
|
for (style = 0; style <= 2; style++) {
|
|
if (! testcase('r') || ! testcase(style))
|
|
continue;
|
|
DBG("--- index scan " << stylename[style] << " ---");
|
|
calcTups(false);
|
|
CHK(insertPk(style) == 0);
|
|
CHK(verifyBlob() == 0);
|
|
CHK(readScan(style, true) == 0);
|
|
if (testcase('u')) {
|
|
CHK(updateScan(style, true) == 0);
|
|
CHK(verifyBlob() == 0);
|
|
}
|
|
CHK(deleteScan(true) == 0);
|
|
CHK(verifyBlob() == 0);
|
|
}
|
|
}
|
|
delete g_ndb;
|
|
return 0;
|
|
}
|
|
|
|
// separate performance test
|
|
|
|
struct Tmr { // stolen from testOIBasic
|
|
Tmr() {
|
|
clr();
|
|
}
|
|
void clr() {
|
|
m_on = m_ms = m_cnt = m_time[0] = m_text[0] = 0;
|
|
}
|
|
void on() {
|
|
assert(m_on == 0);
|
|
m_on = NdbTick_CurrentMillisecond();
|
|
}
|
|
void off(unsigned cnt = 0) {
|
|
NDB_TICKS off = NdbTick_CurrentMillisecond();
|
|
assert(m_on != 0 && off >= m_on);
|
|
m_ms += off - m_on;
|
|
m_cnt += cnt;
|
|
m_on = 0;
|
|
}
|
|
const char* time() {
|
|
if (m_cnt == 0)
|
|
sprintf(m_time, "%u ms", m_ms);
|
|
else
|
|
sprintf(m_time, "%u ms per %u ( %u ms per 1000 )", m_ms, m_cnt, (1000 * m_ms) / m_cnt);
|
|
return m_time;
|
|
}
|
|
const char* pct (const Tmr& t1) {
|
|
if (0 < t1.m_ms)
|
|
sprintf(m_text, "%u pct", (100 * m_ms) / t1.m_ms);
|
|
else
|
|
sprintf(m_text, "[cannot measure]");
|
|
return m_text;
|
|
}
|
|
const char* over(const Tmr& t1) {
|
|
if (0 < t1.m_ms) {
|
|
if (t1.m_ms <= m_ms)
|
|
sprintf(m_text, "%u pct", (100 * (m_ms - t1.m_ms)) / t1.m_ms);
|
|
else
|
|
sprintf(m_text, "-%u pct", (100 * (t1.m_ms - m_ms)) / t1.m_ms);
|
|
} else
|
|
sprintf(m_text, "[cannot measure]");
|
|
return m_text;
|
|
}
|
|
NDB_TICKS m_on;
|
|
unsigned m_ms;
|
|
unsigned m_cnt;
|
|
char m_time[100];
|
|
char m_text[100];
|
|
};
|
|
|
|
static int
|
|
testperf()
|
|
{
|
|
if (! testcase('p'))
|
|
return 0;
|
|
DBG("=== perf test ===");
|
|
g_bh1 = g_bh2 = 0;
|
|
g_ndb = new Ndb(g_ncc, "TEST_DB");
|
|
CHK(g_ndb->init() == 0);
|
|
CHK(g_ndb->waitUntilReady() == 0);
|
|
g_dic = g_ndb->getDictionary();
|
|
NdbDictionary::Table tab(g_opt.m_tnameperf);
|
|
if (g_dic->getTable(tab.getName()) != 0)
|
|
CHK(g_dic->dropTable(tab) == 0);
|
|
// col A - pk
|
|
{ NdbDictionary::Column col("A");
|
|
col.setType(NdbDictionary::Column::Unsigned);
|
|
col.setPrimaryKey(true);
|
|
tab.addColumn(col);
|
|
}
|
|
// col B - char 20
|
|
{ NdbDictionary::Column col("B");
|
|
col.setType(NdbDictionary::Column::Char);
|
|
col.setLength(20);
|
|
col.setNullable(true);
|
|
tab.addColumn(col);
|
|
}
|
|
// col C - text
|
|
{ NdbDictionary::Column col("C");
|
|
col.setType(NdbDictionary::Column::Text);
|
|
col.setInlineSize(20);
|
|
col.setPartSize(512);
|
|
col.setStripeSize(1);
|
|
col.setNullable(true);
|
|
tab.addColumn(col);
|
|
}
|
|
// create
|
|
CHK(g_dic->createTable(tab) == 0);
|
|
Uint32 cA = 0, cB = 1, cC = 2;
|
|
// timers
|
|
Tmr t1;
|
|
Tmr t2;
|
|
// insert char (one trans)
|
|
{
|
|
DBG("--- insert char ---");
|
|
char b[20];
|
|
t1.on();
|
|
CHK((g_con = g_ndb->startTransaction()) != 0);
|
|
for (Uint32 k = 0; k < g_opt.m_rowsperf; k++) {
|
|
CHK((g_opr = g_con->getNdbOperation(tab.getName())) != 0);
|
|
CHK(g_opr->insertTuple() == 0);
|
|
CHK(g_opr->equal(cA, (char*)&k) == 0);
|
|
memset(b, 0x20, sizeof(b));
|
|
b[0] = 'b';
|
|
CHK(g_opr->setValue(cB, b) == 0);
|
|
CHK(g_con->execute(NoCommit) == 0);
|
|
}
|
|
t1.off(g_opt.m_rowsperf);
|
|
CHK(g_con->execute(Rollback) == 0);
|
|
DBG(t1.time());
|
|
g_opr = 0;
|
|
g_con = 0;
|
|
}
|
|
// insert text (one trans)
|
|
{
|
|
DBG("--- insert text ---");
|
|
t2.on();
|
|
CHK((g_con = g_ndb->startTransaction()) != 0);
|
|
for (Uint32 k = 0; k < g_opt.m_rowsperf; k++) {
|
|
CHK((g_opr = g_con->getNdbOperation(tab.getName())) != 0);
|
|
CHK(g_opr->insertTuple() == 0);
|
|
CHK(g_opr->equal(cA, (char*)&k) == 0);
|
|
CHK((g_bh1 = g_opr->getBlobHandle(cC)) != 0);
|
|
CHK((g_bh1->setValue("c", 1) == 0));
|
|
CHK(g_con->execute(NoCommit) == 0);
|
|
}
|
|
t2.off(g_opt.m_rowsperf);
|
|
CHK(g_con->execute(Rollback) == 0);
|
|
DBG(t2.time());
|
|
g_bh1 = 0;
|
|
g_opr = 0;
|
|
g_con = 0;
|
|
}
|
|
// insert overhead
|
|
DBG("insert overhead: " << t2.over(t1));
|
|
t1.clr();
|
|
t2.clr();
|
|
// insert
|
|
{
|
|
DBG("--- insert for read test ---");
|
|
unsigned n = 0;
|
|
char b[20];
|
|
CHK((g_con = g_ndb->startTransaction()) != 0);
|
|
for (Uint32 k = 0; k < g_opt.m_rowsperf; k++) {
|
|
CHK((g_opr = g_con->getNdbOperation(tab.getName())) != 0);
|
|
CHK(g_opr->insertTuple() == 0);
|
|
CHK(g_opr->equal(cA, (char*)&k) == 0);
|
|
memset(b, 0x20, sizeof(b));
|
|
b[0] = 'b';
|
|
CHK(g_opr->setValue(cB, b) == 0);
|
|
CHK((g_bh1 = g_opr->getBlobHandle(cC)) != 0);
|
|
CHK((g_bh1->setValue("c", 1) == 0));
|
|
if (++n == g_opt.m_batch) {
|
|
CHK(g_con->execute(Commit) == 0);
|
|
g_ndb->closeTransaction(g_con);
|
|
CHK((g_con = g_ndb->startTransaction()) != 0);
|
|
n = 0;
|
|
}
|
|
}
|
|
if (n != 0) {
|
|
CHK(g_con->execute(Commit) == 0);
|
|
g_ndb->closeTransaction(g_con); g_con = 0;
|
|
n = 0;
|
|
}
|
|
g_bh1 = 0;
|
|
g_opr = 0;
|
|
}
|
|
// pk read char (one trans)
|
|
{
|
|
DBG("--- pk read char ---");
|
|
CHK((g_con = g_ndb->startTransaction()) != 0);
|
|
Uint32 a;
|
|
char b[20];
|
|
t1.on();
|
|
for (Uint32 k = 0; k < g_opt.m_rowsperf; k++) {
|
|
CHK((g_opr = g_con->getNdbOperation(tab.getName())) != 0);
|
|
CHK(g_opr->readTuple() == 0);
|
|
CHK(g_opr->equal(cA, (char*)&k) == 0);
|
|
CHK(g_opr->getValue(cA, (char*)&a) != 0);
|
|
CHK(g_opr->getValue(cB, b) != 0);
|
|
a = (Uint32)-1;
|
|
b[0] = 0;
|
|
CHK(g_con->execute(NoCommit) == 0);
|
|
CHK(a == k && b[0] == 'b');
|
|
}
|
|
CHK(g_con->execute(Commit) == 0);
|
|
t1.off(g_opt.m_rowsperf);
|
|
DBG(t1.time());
|
|
g_opr = 0;
|
|
g_ndb->closeTransaction(g_con); g_con = 0;
|
|
}
|
|
// pk read text (one trans)
|
|
{
|
|
DBG("--- pk read text ---");
|
|
CHK((g_con = g_ndb->startTransaction()) != 0);
|
|
Uint32 a;
|
|
char c[20];
|
|
t2.on();
|
|
for (Uint32 k = 0; k < g_opt.m_rowsperf; k++) {
|
|
CHK((g_opr = g_con->getNdbOperation(tab.getName())) != 0);
|
|
CHK(g_opr->readTuple() == 0);
|
|
CHK(g_opr->equal(cA, (char*)&k) == 0);
|
|
CHK(g_opr->getValue(cA, (char*)&a) != 0);
|
|
CHK((g_bh1 = g_opr->getBlobHandle(cC)) != 0);
|
|
a = (Uint32)-1;
|
|
c[0] = 0;
|
|
CHK(g_con->execute(NoCommit) == 0);
|
|
Uint32 m = 20;
|
|
CHK(g_bh1->readData(c, m) == 0);
|
|
CHK(a == k && m == 1 && c[0] == 'c');
|
|
}
|
|
CHK(g_con->execute(Commit) == 0);
|
|
t2.off(g_opt.m_rowsperf);
|
|
DBG(t2.time());
|
|
g_ndb->closeTransaction(g_con); g_opr = 0;
|
|
g_con = 0;
|
|
}
|
|
// pk read overhead
|
|
DBG("pk read overhead: " << t2.over(t1));
|
|
t1.clr();
|
|
t2.clr();
|
|
// scan read char
|
|
{
|
|
DBG("--- scan read char ---");
|
|
Uint32 a;
|
|
char b[20];
|
|
CHK((g_con = g_ndb->startTransaction()) != 0);
|
|
CHK((g_ops = g_con->getNdbScanOperation(tab.getName())) != 0);
|
|
CHK(g_ops->readTuples(NdbOperation::LM_Read) == 0);
|
|
CHK(g_ops->getValue(cA, (char*)&a) != 0);
|
|
CHK(g_ops->getValue(cB, b) != 0);
|
|
CHK(g_con->execute(NoCommit) == 0);
|
|
unsigned n = 0;
|
|
t1.on();
|
|
while (1) {
|
|
a = (Uint32)-1;
|
|
b[0] = 0;
|
|
int ret;
|
|
CHK((ret = g_ops->nextResult(true)) == 0 || ret == 1);
|
|
if (ret == 1)
|
|
break;
|
|
CHK(a < g_opt.m_rowsperf && b[0] == 'b');
|
|
n++;
|
|
}
|
|
CHK(n == g_opt.m_rowsperf);
|
|
t1.off(g_opt.m_rowsperf);
|
|
DBG(t1.time());
|
|
g_ndb->closeTransaction(g_con); g_ops = 0;
|
|
g_con = 0;
|
|
}
|
|
// scan read text
|
|
{
|
|
DBG("--- read text ---");
|
|
Uint32 a;
|
|
char c[20];
|
|
CHK((g_con = g_ndb->startTransaction()) != 0);
|
|
CHK((g_ops = g_con->getNdbScanOperation(tab.getName())) != 0);
|
|
CHK(g_ops->readTuples(NdbOperation::LM_Read) == 0);
|
|
CHK(g_ops->getValue(cA, (char*)&a) != 0);
|
|
CHK((g_bh1 = g_ops->getBlobHandle(cC)) != 0);
|
|
CHK(g_con->execute(NoCommit) == 0);
|
|
unsigned n = 0;
|
|
t2.on();
|
|
while (1) {
|
|
a = (Uint32)-1;
|
|
c[0] = 0;
|
|
int ret;
|
|
CHK((ret = g_ops->nextResult(true)) == 0 || ret == 1);
|
|
if (ret == 1)
|
|
break;
|
|
Uint32 m = 20;
|
|
CHK(g_bh1->readData(c, m) == 0);
|
|
CHK(a < g_opt.m_rowsperf && m == 1 && c[0] == 'c');
|
|
n++;
|
|
}
|
|
CHK(n == g_opt.m_rowsperf);
|
|
t2.off(g_opt.m_rowsperf);
|
|
DBG(t2.time());
|
|
g_bh1 = 0;
|
|
g_ops = 0;
|
|
g_ndb->closeTransaction(g_con); g_con = 0;
|
|
}
|
|
// scan read overhead
|
|
DBG("scan read overhead: " << t2.over(t1));
|
|
t1.clr();
|
|
t2.clr();
|
|
delete g_ndb;
|
|
return 0;
|
|
}
|
|
|
|
// bug tests
|
|
|
|
static int
|
|
bugtest_4088()
|
|
{
|
|
unsigned i;
|
|
DBG("bug test 4088 - ndb api hang with mixed ops on index table");
|
|
// insert rows
|
|
calcTups(false);
|
|
CHK(insertPk(false) == 0);
|
|
// new trans
|
|
CHK((g_con = g_ndb->startTransaction()) != 0);
|
|
for (unsigned k = 0; k < g_opt.m_rows; k++) {
|
|
Tup& tup = g_tups[k];
|
|
// read table pk via index as a table
|
|
const unsigned pkcnt = 2;
|
|
Tup pktup[pkcnt];
|
|
for (i = 0; i < pkcnt; i++) {
|
|
char name[20];
|
|
// XXX guess table id
|
|
sprintf(name, "%d/%s", 4, g_opt.m_x1name);
|
|
CHK((g_opr = g_con->getNdbOperation(name)) != 0);
|
|
CHK(g_opr->readTuple() == 0);
|
|
CHK(g_opr->equal("PK2", tup.m_pk2) == 0);
|
|
CHK(g_opr->getValue("NDB$PK", (char*)&pktup[i].m_pk1) != 0);
|
|
}
|
|
// read blob inline via index as an index
|
|
CHK((g_opx = g_con->getNdbIndexOperation(g_opt.m_x1name, g_opt.m_tname)) != 0);
|
|
CHK(g_opx->readTuple() == 0);
|
|
CHK(g_opx->equal("PK2", tup.m_pk2) == 0);
|
|
assert(tup.m_blob1.m_buf != 0);
|
|
CHK(g_opx->getValue("BL1", (char*)tup.m_blob1.m_buf) != 0);
|
|
// execute
|
|
// BUG 4088: gets 1 tckeyconf, 1 tcindxconf, then hangs
|
|
CHK(g_con->execute(Commit) == 0);
|
|
// verify
|
|
for (i = 0; i < pkcnt; i++) {
|
|
CHK(pktup[i].m_pk1 == tup.m_pk1);
|
|
CHK(memcmp(pktup[i].m_pk2, tup.m_pk2, g_opt.m_pk2len) == 0);
|
|
}
|
|
CHK(memcmp(tup.m_blob1.m_val, tup.m_blob1.m_buf, 8 + g_opt.m_blob1.m_inline) == 0);
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
bugtest_2222()
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
bugtest_3333()
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static struct {
|
|
int m_bug;
|
|
int (*m_test)();
|
|
} g_bugtest[] = {
|
|
{ 4088, bugtest_4088 }
|
|
};
|
|
|
|
NDB_COMMAND(testOdbcDriver, "testBlobs", "testBlobs", "testBlobs", 65535)
|
|
{
|
|
ndb_init();
|
|
while (++argv, --argc > 0) {
|
|
const char* arg = argv[0];
|
|
if (strcmp(arg, "-batch") == 0) {
|
|
if (++argv, --argc > 0) {
|
|
g_opt.m_batch = atoi(argv[0]);
|
|
continue;
|
|
}
|
|
}
|
|
if (strcmp(arg, "-core") == 0) {
|
|
g_opt.m_core = true;
|
|
continue;
|
|
}
|
|
if (strcmp(arg, "-dbg") == 0) {
|
|
g_opt.m_dbg = true;
|
|
continue;
|
|
}
|
|
if (strcmp(arg, "-dbgall") == 0) {
|
|
g_opt.m_dbg = true;
|
|
g_opt.m_dbgall = true;
|
|
putenv(strdup("NDB_BLOB_DEBUG=1"));
|
|
continue;
|
|
}
|
|
if (strcmp(arg, "-dbug") == 0) {
|
|
if (++argv, --argc > 0) {
|
|
g_opt.m_dbug = strdup(argv[0]);
|
|
continue;
|
|
}
|
|
}
|
|
if (strcmp(arg, "-fac") == 0) {
|
|
g_opt.m_fac = true;
|
|
continue;
|
|
}
|
|
if (strcmp(arg, "-full") == 0) {
|
|
g_opt.m_full = true;
|
|
continue;
|
|
}
|
|
if (strcmp(arg, "-loop") == 0) {
|
|
if (++argv, --argc > 0) {
|
|
g_opt.m_loop = atoi(argv[0]);
|
|
continue;
|
|
}
|
|
}
|
|
if (strcmp(arg, "-parts") == 0) {
|
|
if (++argv, --argc > 0) {
|
|
g_opt.m_parts = atoi(argv[0]);
|
|
continue;
|
|
}
|
|
}
|
|
if (strcmp(arg, "-rows") == 0) {
|
|
if (++argv, --argc > 0) {
|
|
g_opt.m_rows = atoi(argv[0]);
|
|
continue;
|
|
}
|
|
}
|
|
if (strcmp(arg, "-rowsperf") == 0) {
|
|
if (++argv, --argc > 0) {
|
|
g_opt.m_rowsperf = atoi(argv[0]);
|
|
continue;
|
|
}
|
|
}
|
|
if (strcmp(arg, "-seed") == 0) {
|
|
if (++argv, --argc > 0) {
|
|
g_opt.m_seed = atoi(argv[0]);
|
|
continue;
|
|
}
|
|
}
|
|
if (strcmp(arg, "-skip") == 0) {
|
|
if (++argv, --argc > 0) {
|
|
g_opt.m_skip = strdup(argv[0]);
|
|
continue;
|
|
}
|
|
}
|
|
if (strcmp(arg, "-test") == 0) {
|
|
if (++argv, --argc > 0) {
|
|
g_opt.m_test = strdup(argv[0]);
|
|
continue;
|
|
}
|
|
}
|
|
// metadata
|
|
if (strcmp(arg, "-pk2len") == 0) {
|
|
if (++argv, --argc > 0) {
|
|
g_opt.m_pk2len = atoi(argv[0]);
|
|
if (g_opt.m_pk2len <= g_max_pk2len)
|
|
continue;
|
|
}
|
|
}
|
|
if (strcmp(arg, "-oneblob") == 0) {
|
|
g_opt.m_oneblob = true;
|
|
continue;
|
|
}
|
|
// bugs
|
|
if (strcmp(arg, "-bug") == 0) {
|
|
if (++argv, --argc > 0) {
|
|
g_opt.m_bug = atoi(argv[0]);
|
|
for (unsigned i = 0; i < sizeof(g_bugtest)/sizeof(g_bugtest[0]); i++) {
|
|
if (g_opt.m_bug == g_bugtest[i].m_bug) {
|
|
g_opt.m_bugtest = g_bugtest[i].m_test;
|
|
break;
|
|
}
|
|
}
|
|
if (g_opt.m_bugtest != 0)
|
|
continue;
|
|
}
|
|
}
|
|
ndbout << "testOIBasic: unknown option " << arg << endl;
|
|
printusage();
|
|
return NDBT_ProgramExit(NDBT_WRONGARGS);
|
|
}
|
|
if (g_opt.m_dbug != 0) {
|
|
DBUG_PUSH(g_opt.m_dbug);
|
|
}
|
|
if (g_opt.m_pk2len == 0) {
|
|
char b[100];
|
|
b[0] = 0;
|
|
if (g_opt.m_skip != 0)
|
|
strcpy(b, g_opt.m_skip);
|
|
strcat(b, "i");
|
|
strcat(b, "r");
|
|
g_opt.m_skip = strdup(b);
|
|
}
|
|
g_ncc = new Ndb_cluster_connection();
|
|
if (g_ncc->connect(30) != 0 || testmain() == -1 || testperf() == -1) {
|
|
ndbout << "line " << __LINE__ << " FAIL loop=" << g_loop << endl;
|
|
return NDBT_ProgramExit(NDBT_FAILED);
|
|
}
|
|
delete g_ncc;
|
|
g_ncc = 0;
|
|
return NDBT_ProgramExit(NDBT_OK);
|
|
}
|
|
|
|
// vim: set sw=2 et:
|