mirror of
https://github.com/MariaDB/server.git
synced 2025-05-10 02:01:19 +03:00
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
2138 lines
69 KiB
C++
2138 lines
69 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 */
|
|
|
|
// ODBC.cpp : Defines the entry point for the console application.
|
|
//
|
|
|
|
#include "SQL99_test.h"
|
|
#include <iostream> // Loose later
|
|
|
|
using namespace std; //
|
|
|
|
#define MAXCOL 64
|
|
#define DEFCOL 4
|
|
|
|
#define MAXROW 64
|
|
#define DEFROW 8
|
|
|
|
#define MAXTHREADS 24
|
|
#define DEFTHREADS 2
|
|
|
|
#define MAXTABLES 16
|
|
#define DEFTABLES 2
|
|
|
|
#define MAXLOOPS 100000
|
|
#define DEFLOOPS 4
|
|
|
|
#define UPDATE_VALUE 7
|
|
|
|
#define PKSIZE 2
|
|
|
|
|
|
static int nNoOfThreads = 1 ;
|
|
static int nNoOfCol = 4 ;
|
|
static int nNoOfRows = 2 ;
|
|
static int nNoOfLoops = 0 ;
|
|
static int nNoOfTables = 2 ;
|
|
static int nAPI = 0 ;
|
|
static int tAttributeSize = sizeof(char) ;
|
|
static attr_type AttributeType = T_CHAR ;
|
|
static int nAggregate = 0 ;
|
|
static int nArithmetic = 0 ;
|
|
static int nPrint = 0 ;
|
|
static int nColList = 0 ;
|
|
static char szColNames[MAXCOL*MAX_COL_NAME] = { 0 } ;
|
|
int createTables(char* szTableName, int nTables) ;
|
|
|
|
|
|
/*************************************************
|
|
Function: main - the entry point
|
|
*************************************************/
|
|
int main(int argc, char* argv[]){
|
|
|
|
int nRetrunValue = NDBT_FAILED ;
|
|
SQLRETURN rc = SQL_ERROR ;
|
|
double dResultA = 0 ;
|
|
double dResultB = 0 ;
|
|
double dInput = 0 ;
|
|
int x = 0, y = 0 ;
|
|
int* pIntRefBuffer = NULL ;
|
|
float* pFloatRefBuffer = NULL ;
|
|
double* pDoubleRefBuffer = NULL ;
|
|
char* pCharRefBuffer = NULL ;
|
|
char szColBuffer[MAX_COL_NAME] = { 0 } ;
|
|
|
|
|
|
ParseArguments(argc, (const char**)argv) ;
|
|
|
|
PARAMS* pparams = (PARAMS*)malloc(sizeof(PARAMS)*nNoOfThreads) ;
|
|
memset(pparams, 0, (sizeof(PARAMS)*nNoOfThreads)) ;
|
|
|
|
char* szTableNames = (char*)malloc(sizeof(char)*nNoOfTables*MAX_TABLE_NAME) ;
|
|
memset(szTableNames, 0, sizeof(char)*nNoOfTables*MAX_TABLE_NAME) ;
|
|
|
|
UintPtr pThreadHandles[MAXTHREADS] = { NULL } ;
|
|
|
|
AssignTableNames(szTableNames, nNoOfTables) ;
|
|
|
|
if(nAPI){
|
|
if(0 != createTables(szTableNames, nNoOfTables)){
|
|
printf("Failed to create tables through NDB API; quitting...\n") ;
|
|
NDBT_ProgramExit(NDBT_FAILED) ;
|
|
return NDBT_FAILED ;
|
|
}
|
|
}else{
|
|
|
|
//CreateDemoTables(szTableNames, nNoOfTables, DROP) ;
|
|
rc = CreateDemoTables(szTableNames, nNoOfTables, CREATE) ;
|
|
if(!(SQL_SUCCESS == rc || SQL_SUCCESS_WITH_INFO == rc)){
|
|
printf("Failed to create tables, quiting now.\n") ;
|
|
NDBT_ProgramExit(NDBT_FAILED) ;
|
|
return NDBT_FAILED ;
|
|
}
|
|
}
|
|
|
|
// Store column names in the buffer for use in some stmts
|
|
int k = 0 ;
|
|
for(;;){
|
|
memset((char*)szColBuffer, 0, strlen(szColBuffer)) ;
|
|
sprintf((char*)szColBuffer, "COL%d", k) ;
|
|
strcat((char*)szColNames, (char*)szColBuffer) ;
|
|
++k ;
|
|
if( k == nNoOfCol ){
|
|
break ;
|
|
}
|
|
strcat((char*)szColNames, ", ") ;
|
|
} // for
|
|
|
|
|
|
switch(AttributeType){
|
|
case T_INT:
|
|
pIntRefBuffer = (int*)malloc(sizeof(int)*nNoOfRows*nNoOfCol*nNoOfThreads) ;
|
|
memset(pIntRefBuffer, 0, sizeof(int)*nNoOfRows*nNoOfCol*nNoOfThreads) ;
|
|
AssignRefNumValues(pIntRefBuffer, T_INT, nPrint) ;
|
|
StartThreads(pparams, (void*)pIntRefBuffer, nNoOfTables, szTableNames, AttributeType, pThreadHandles) ;
|
|
break ;
|
|
case T_FLOAT:
|
|
pFloatRefBuffer = (float*)malloc(sizeof(float)*nNoOfRows*nNoOfCol*nNoOfThreads) ;
|
|
memset(pFloatRefBuffer, 0, sizeof(float)*nNoOfRows*nNoOfCol*nNoOfThreads) ;
|
|
AssignRefNumValues(pFloatRefBuffer, T_FLOAT, nPrint) ;
|
|
StartThreads(pparams, (void*)pFloatRefBuffer, nNoOfTables, szTableNames, AttributeType, pThreadHandles) ;
|
|
break ;
|
|
/* case T_DOUBLE:
|
|
pDoubleRefBuffer = (double*)malloc(sizeof(double)*nNoOfRows*nNoOfCol*nNoOfThreads) ;
|
|
memset(pDoubleRefBuffer, 0, sizeof(double)*nNoOfRows*nNoOfCol*nNoOfThreads) ;
|
|
AssignRefNumValues(pDoubleRefBuffer, T_DOUBLE, 0) ;
|
|
StartThreads(pparams, (void*)pDoubleRefBuffer, nNoOfTables, szTableNames, AttributeType, pThreadHandles) ;
|
|
break ;
|
|
*/
|
|
case T_CHAR:
|
|
pCharRefBuffer = (char*)malloc(sizeof(char)*nNoOfRows*nNoOfCol*nNoOfThreads*MAX_CHAR_ATTR_LEN) ;
|
|
memset(pCharRefBuffer, 0, sizeof(char)*nNoOfRows*nNoOfCol*nNoOfThreads*MAX_CHAR_ATTR_LEN) ;
|
|
AssignRefCharValues(pCharRefBuffer, nPrint ) ;
|
|
StartThreads(pparams, (void*)pCharRefBuffer, nNoOfTables, szTableNames, AttributeType, pThreadHandles) ;
|
|
break ;
|
|
default:
|
|
break ;
|
|
}
|
|
|
|
NdbThread_SetConcurrencyLevel(nNoOfThreads + 2) ;
|
|
|
|
|
|
printf("\nPerforming inserts...") ;
|
|
SetThreadOperationType(pparams, T_INSERT) ;
|
|
if(0 < WaitForThreads(pparams)){
|
|
printf("\t\t%d thread(s) failed\n") ;
|
|
}else{
|
|
printf("\t\tdone\n") ;
|
|
}
|
|
printf("----------------------\n\n") ;
|
|
PrintAll(szTableNames, nNoOfTables, AttributeType) ;
|
|
|
|
printf("\nVerifying inserts...") ;
|
|
SetThreadOperationType(pparams, T_READ_VERIFY) ;
|
|
if(0 < WaitForThreads(pparams)){
|
|
printf("\t\t%d thread(s) failed\n") ;
|
|
}else{
|
|
printf("\t\tdone\n") ;
|
|
}
|
|
printf("----------------------\n\n") ;
|
|
|
|
printf("\nPerforming updates...") ;
|
|
SetThreadOperationType(pparams, T_UPDATE) ;
|
|
if(0 < WaitForThreads(pparams)){
|
|
printf("\t\t%d thread(s) failed\n") ;
|
|
}else{
|
|
printf("\t\tdone\n") ;
|
|
}
|
|
printf("----------------------\n\n") ;
|
|
//PrintAll(szTableNames, nNoOfTables, AttributeType) ;
|
|
|
|
printf("\nVerifying updates...") ;
|
|
SetThreadOperationType(pparams, T_READ_VERIFY) ;
|
|
if(0 < WaitForThreads(pparams)){
|
|
printf("\t\t%d thread(s) failed\n") ;
|
|
}else{
|
|
printf("\t\tdone\n") ;
|
|
}
|
|
printf("----------------------\n\n") ;
|
|
|
|
printf("\nPerforming reads...") ;
|
|
SetThreadOperationType(pparams, T_READ) ;
|
|
if(0 < WaitForThreads(pparams)){
|
|
printf("\t\t%d thread(s) failed\n") ;
|
|
}else{
|
|
printf("\t\tdone\n") ;
|
|
}
|
|
printf("----------------------\n\n") ;
|
|
PrintAll(szTableNames, nNoOfTables, AttributeType) ;
|
|
|
|
|
|
if(T_CHAR != AttributeType && nAggregate){
|
|
printf("\nTesting aggregate functions for each table\n\n") ;
|
|
printf("FN\tCOLUMN\tVALUE\t\t\tTOTAL ROWS WHERE\n\t\t\t\t\tVALUE(S) > VALUE\n--------------------------------------------------------\n\n") ;
|
|
|
|
for(y = 0 ; y < nNoOfTables ; ++y){
|
|
for(x = 0; x < nNoOfCol ; ++x){
|
|
dResultA = dResultB = 0 ;
|
|
AggregateFn(FN_MIN, (char*)(szTableNames + MAX_TABLE_NAME*y), x, NULL, &dResultA, AttributeType) ;
|
|
AggregateFn(FN_COUNT, (char*)(szTableNames + MAX_TABLE_NAME*y) , x, &dResultA, &dResultB, AttributeType) ;
|
|
ATTR_TYPE_SWITCH_AGR("MIN", x, dResultA, dResultB, AttributeType) ;
|
|
}
|
|
}
|
|
|
|
for(y = 0; y < nNoOfTables ; ++y){
|
|
for(x = 0; x < nNoOfCol ; ++x){
|
|
dResultA = dResultB = 0 ;
|
|
AggregateFn(FN_MAX, (char*)(szTableNames + MAX_TABLE_NAME*y), x, NULL, &dResultA, AttributeType) ;
|
|
AggregateFn(FN_COUNT, (char*)(szTableNames + MAX_TABLE_NAME*y), x, &dResultA, &dResultB, AttributeType) ;
|
|
ATTR_TYPE_SWITCH_AGR("MAX", x, dResultA, dResultB, AttributeType) ;
|
|
}
|
|
}
|
|
|
|
for(y = 0 ; y < nNoOfTables ; ++y){
|
|
for(x = 0; x < nNoOfCol ; ++x){
|
|
dResultA = dResultB = 0 ;
|
|
AggregateFn(FN_AVG, (char*)(szTableNames + MAX_TABLE_NAME*y), x, NULL, &dResultA, AttributeType) ;
|
|
AggregateFn(FN_COUNT, (char*)(szTableNames + MAX_TABLE_NAME*y), x, &dResultA, &dResultB, AttributeType) ;
|
|
ATTR_TYPE_SWITCH_AGR("AVG", x, dResultA, dResultB, AttributeType)
|
|
}
|
|
}
|
|
|
|
printf("--------------------------------------------------------\n\n") ;
|
|
}
|
|
|
|
if(T_CHAR != AttributeType && nArithmetic){
|
|
|
|
float nVal = (rand() % 10) /1.82342 ;
|
|
|
|
for(int h = 0 ; h < nNoOfTables ; ++h){
|
|
|
|
printf("\nTesting arithmetic operators\nfor each column in %s:\n----------------------\n", (char*)(szTableNames + MAX_TABLE_NAME*sizeof(char)*h) ) ;
|
|
|
|
printf("\nOperator [ * ]... \t\t") ;
|
|
ArithOp((char*)(szTableNames + MAX_TABLE_NAME*sizeof(char)*h), nNoOfCol, &nVal, AttributeType, MULTI) ;
|
|
printf("done\n") ;
|
|
|
|
printf("\nOperator [ / ]... \t\t") ;
|
|
ArithOp((char*)(szTableNames + MAX_TABLE_NAME*sizeof(char)*h), nNoOfCol, &nVal, AttributeType, DIVIDE) ;
|
|
printf("done\n") ;
|
|
|
|
printf("\nOperator [ + ]... \t\t") ;
|
|
ArithOp((char*)(szTableNames + MAX_TABLE_NAME*sizeof(char)*h), nNoOfCol, &nVal, AttributeType, PLUS) ;
|
|
printf("done\n") ;
|
|
|
|
printf("\nOperator [ - ]... \t\t") ;
|
|
ArithOp((char*)(szTableNames + MAX_TABLE_NAME*sizeof(char)*h), nNoOfCol, &nVal, AttributeType, MINUS) ;
|
|
printf("done\n\n") ;
|
|
/*
|
|
printf("\nOperator [ % ]... \t\t") ;
|
|
ArithOp((char*)szTableNames, nNoOfCol, &nVal, AttributeType, MODULO) ;
|
|
printf("done\n\n") ;
|
|
*/
|
|
}
|
|
}
|
|
/*
|
|
printf("\nPerforming deletes...") ;
|
|
SetThreadOperationType(pparams, T_DELETE) ;
|
|
if(0 < WaitForThreads(pparams)){
|
|
printf("\t\t%d thread(s) failed\n") ;
|
|
}else{
|
|
printf("\t\tdone\n") ;
|
|
}
|
|
printf("----------------------\n\n") ;
|
|
|
|
printf("\nVerifying deletes...") ;
|
|
SetThreadOperationType(pparams, T_DELETE_VERIFY) ;
|
|
if(0 < WaitForThreads(pparams)){
|
|
printf("\t\t%d thread(s) failed\n") ;
|
|
}else{
|
|
printf("\t\tdone\n") ;
|
|
}
|
|
printf("----------------------\n\n") ;
|
|
*/
|
|
StopThreads(pparams, pThreadHandles) ;
|
|
|
|
//PrintAll(szTableNames, nNoOfTables, AttributeType) ;
|
|
|
|
//CreateDemoTables(szTableNames, nNoOfTables, DROP) ;
|
|
|
|
free((void*)szTableNames) ;
|
|
free((void*)pparams) ;
|
|
free((void*)pIntRefBuffer) ;
|
|
free((void*)pFloatRefBuffer) ;
|
|
free((void*)pDoubleRefBuffer) ;
|
|
free((void*)pCharRefBuffer) ;
|
|
|
|
return 0;
|
|
}
|
|
|
|
|
|
|
|
/**************************************************
|
|
Function: ParseArguments
|
|
***************************************************/
|
|
void ParseArguments(int argc, const char** argv){
|
|
|
|
int i = 1;
|
|
|
|
while (argc > 1){
|
|
|
|
if (strcmp(argv[i], "-t") == 0)
|
|
{
|
|
nNoOfThreads = atoi(argv[i+1]);
|
|
if ((nNoOfThreads < 1) || (nNoOfThreads > MAXTHREADS))
|
|
nNoOfThreads = DEFTHREADS ;
|
|
}
|
|
else if (strcmp(argv[i], "-c") == 0)
|
|
{
|
|
nNoOfCol = atoi(argv[i+1]);
|
|
if ((nNoOfCol < 2) || (nNoOfCol > MAXCOL))
|
|
nNoOfCol = DEFCOL ;
|
|
}
|
|
else if (strcmp(argv[i], "-l") == 0)
|
|
{
|
|
nNoOfLoops = atoi(argv[i+1]);
|
|
if ((nNoOfLoops < 0) || (nNoOfLoops > MAXLOOPS))
|
|
nNoOfLoops = DEFLOOPS ;
|
|
}
|
|
else if (strcmp(argv[i], "-r") == 0)
|
|
{
|
|
nNoOfRows = atoi(argv[i+1]);;
|
|
if ((nNoOfRows < 0) || (nNoOfRows > MAXROW))
|
|
nNoOfRows = DEFROW ;
|
|
}
|
|
else if (strcmp(argv[i], "-m") == 0)
|
|
{
|
|
nArithmetic = 1 ;
|
|
argc++ ;
|
|
i-- ;
|
|
}
|
|
else if (strcmp(argv[i], "-g") == 0)
|
|
{
|
|
nAggregate = 1 ;
|
|
argc++ ;
|
|
i-- ;
|
|
}
|
|
else if (strcmp(argv[i], "-n") == 0)
|
|
{
|
|
nAPI = 1 ;
|
|
argc++ ;
|
|
i-- ;
|
|
}
|
|
else if (strcmp(argv[i], "-v") == 0)
|
|
{
|
|
nPrint = 1 ;
|
|
argc++ ;
|
|
i-- ;
|
|
}
|
|
else if (strcmp(argv[i], "-a") == 0)
|
|
{
|
|
if(strcmp(argv[i+1], "int") == 0){
|
|
AttributeType = T_INT ;
|
|
tAttributeSize = 32 ;
|
|
}else if(strcmp(argv[i+1], "float") == 0){
|
|
AttributeType = T_FLOAT ;
|
|
tAttributeSize = 64 ;
|
|
}else if(strcmp(argv[i+1], "char") == 0){
|
|
AttributeType = T_CHAR ;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
cout << "Arguments:\n";
|
|
cout << "-n Create tables using NDB API (vs ODBC by default)" << endl;
|
|
cout << "-t Number of threads; maximum 24, default 2\n" << endl;
|
|
cout << "-c Number of columns per table; maximum 64, default 4\n" << endl;
|
|
cout << "-r Number of rows; maximum 64, default 8\n" << endl;
|
|
cout << "-a Type of attribute to use: int, double or char; default int " << endl;
|
|
cout << "-g Test aggregate functions" << endl;
|
|
cout << "-m Test arithmetic operators" << endl;
|
|
cout << "-v Print executed statements" << endl;
|
|
exit(-1);
|
|
}
|
|
|
|
argc -= 2 ;
|
|
i = i + 2 ;
|
|
}
|
|
|
|
char *szAttrType[MAX_STR_LEN] = { 0 } ;
|
|
switch(AttributeType){
|
|
case T_INT:
|
|
strcpy((char*)szAttrType, "Integer") ;
|
|
break ;
|
|
case T_FLOAT:
|
|
strcpy((char*)szAttrType, "Float") ;
|
|
break ;
|
|
/* case T_DOUBLE:
|
|
strcpy((char*)szAttrType, "Double") ;
|
|
break ;
|
|
*/
|
|
case T_CHAR:
|
|
strcpy((char*)szAttrType, "Character") ;
|
|
break ;
|
|
default:
|
|
strcpy((char*)szAttrType, "Not defined") ;
|
|
break ;
|
|
}
|
|
|
|
|
|
printf("\n\nCurrent parameters: %d thread(s), %d tables, %d rows, %d colums, attribute type: %s\n\n", nNoOfThreads, nNoOfTables, nNoOfRows, nNoOfCol, szAttrType) ;
|
|
}
|
|
|
|
|
|
|
|
|
|
/*************************************************
|
|
Function: ThreadFnInt - thread function
|
|
for int attributes
|
|
*************************************************/
|
|
void* ThreadFnInt(void* pparams){
|
|
|
|
SQLRETURN retcode = SQL_ERROR ;
|
|
SQLCHAR szStmtBuffer[MAX_SQL_STMT] = { 0 } ;
|
|
SQLCHAR szValueBuffer[MAX_VALUE_LEN] = { 0 } ;
|
|
SQLCHAR szAuxBuffer[MAX_STR_LEN] = { 0 } ;
|
|
SQLCHAR szColBuffer[MAX_COL_NAME] = { 0 } ;
|
|
SQLINTEGER cbInt = 0 ;
|
|
ODBC_HANDLES stHandles ;
|
|
memset(&stHandles, 0, sizeof(ODBC_HANDLES)) ;
|
|
|
|
int r = 0, j = 0 ;
|
|
//Get thread parameters
|
|
PARAMS* p = (PARAMS*)pparams ;
|
|
int* pRef = (int*)p->pThreadRef ;
|
|
|
|
int* pBindBuffer = (int*)malloc(sizeof(int)*nNoOfCol) ;
|
|
|
|
//printf("Thread #%d\n", p->nThreadID) ;
|
|
|
|
retcode = GetHandles(&stHandles, GET, 0) ;
|
|
|
|
if (SQL_SUCCESS == retcode || SQL_SUCCESS_WITH_INFO == retcode ) {
|
|
p->report_status = S_STARTED ;
|
|
}else{
|
|
printf("Thread #%d failed to allocate handles, exiting now.\n", p->nThreadID) ;
|
|
free((void*)pBindBuffer) ;
|
|
p->nError = 1 ;
|
|
p->report_status = S_EXIT ;
|
|
return 0 ;
|
|
}
|
|
|
|
//p->report_status = S_STARTED ;
|
|
|
|
//Main thread loop
|
|
for(;;){
|
|
|
|
while(S_IDLE == p->thread_status){
|
|
NdbSleep_MilliSleep(1) ;
|
|
}
|
|
|
|
if(S_STOP == p->thread_status) {
|
|
break ;
|
|
}else{
|
|
p->thread_status = S_BUSY ;
|
|
}
|
|
|
|
switch(p->op_type){
|
|
|
|
|
|
/************************************** T_INSERT case **************************************/
|
|
case T_INSERT:
|
|
|
|
for(r = 0 ; r < nNoOfRows ; ++r){
|
|
|
|
if(!nColList){
|
|
sprintf((char*)szStmtBuffer, "INSERT INTO %s VALUES(", p->szTableName) ;
|
|
}else{
|
|
sprintf((char*)szStmtBuffer, "INSERT INTO %s (%s) VALUES(", p->szTableName, szColNames) ;
|
|
}
|
|
|
|
//sprintf((char*)szStmtBuffer, "INSERT INTO %s VALUES(", p->szTableName) ;
|
|
|
|
for(j = 0 ;;){
|
|
sprintf((char*)szValueBuffer,"%d", pRef[nNoOfCol*r + j]) ;
|
|
strncat((char*)szStmtBuffer, (char*)szValueBuffer, strlen((char*)szValueBuffer)) ;
|
|
++j ;
|
|
if(nNoOfCol == j) break ;
|
|
strcat((char*)szStmtBuffer, ", ") ;
|
|
}
|
|
strcat((char*)szStmtBuffer, ")") ;
|
|
if(nPrint) printf("\n> %s\n", szStmtBuffer) ;
|
|
retcode = SQLExecDirect(stHandles.hstmt, szStmtBuffer, SQL_NTS) ;
|
|
if(SQL_SUCCESS == retcode || SQL_SUCCESS_WITH_INFO == retcode){
|
|
}else{
|
|
p->nError = 1 ;
|
|
printf("INSERT in thread #%d failed\n", p->nThreadID) ;
|
|
HandleError(stHandles.hstmt, SQL_HANDLE_STMT) ;
|
|
}
|
|
}
|
|
break ;
|
|
|
|
|
|
/************************************** T_READ case **************************************/
|
|
case T_READ:
|
|
|
|
for(r = 0 ; r < nNoOfRows ; r++){
|
|
|
|
sprintf((char*)szStmtBuffer, "SELECT * FROM %s WHERE COL0 = %d", p->szTableName, pRef[nNoOfCol*r]) ;
|
|
if(nPrint) printf("\n> %s\n", szStmtBuffer) ;
|
|
ODBC_FN(SQLExecDirect(stHandles.hstmt, (SQLCHAR*)szStmtBuffer, SQL_NTS), retcode) ;
|
|
|
|
for(j = 0 ; j < nNoOfCol ; ++j){
|
|
ODBC_FN(SQLBindCol(stHandles.hstmt, (j+1), SQL_C_SLONG, (void*)&pBindBuffer[j], sizeof(SQLINTEGER), &cbInt), retcode) ;
|
|
}
|
|
|
|
for (;;) {
|
|
retcode = SQLFetch(stHandles.hstmt);
|
|
|
|
if (SQL_SUCCESS == retcode || SQL_SUCCESS_WITH_INFO == retcode){
|
|
for(int k = 0 ; k < nNoOfCol ; ++k){
|
|
if(p->nVerifyFlag){
|
|
if(pBindBuffer[k] != pRef[nNoOfCol*r + k])
|
|
printf("Expected: %d Actual: %d\n", pBindBuffer[k], pRef[nNoOfCol*r + k]) ;
|
|
}
|
|
}
|
|
}else if(SQL_NO_DATA == retcode){
|
|
break ;
|
|
}else{
|
|
p->nError = 1 ;
|
|
printf("READ in thread #%d failed\n", p->nThreadID) ;
|
|
HandleError(stHandles.hstmt, SQL_HANDLE_STMT) ;
|
|
}
|
|
//printf("\n") ;
|
|
}
|
|
SQLCloseCursor(stHandles.hstmt) ;
|
|
}
|
|
break ;
|
|
|
|
|
|
/************************************** T_UPDATE case **************************************/
|
|
case T_UPDATE:
|
|
for(r = 0 ; r < nNoOfRows ; ++r){
|
|
|
|
sprintf((char*)szStmtBuffer, "UPDATE %s SET ", p->szTableName) ;
|
|
for(j = 1 ;;){
|
|
pRef[nNoOfCol*r + j] = pRef[nNoOfCol*r + j] + UPDATE_VALUE ;
|
|
sprintf((char*)szColBuffer,"COL%d = %d", j, pRef[nNoOfCol*r + j]) ;
|
|
strncat((char*)szStmtBuffer, (char*)szColBuffer, strlen((char*)szColBuffer)) ;
|
|
++j ;
|
|
if(nNoOfCol == j) break ;
|
|
strcat((char*)szStmtBuffer, ", ") ;
|
|
}
|
|
sprintf((char*)szAuxBuffer, " WHERE COL0 = %d ;", pRef[nNoOfCol*r]) ;
|
|
strcat((char*)szStmtBuffer, (char*)szAuxBuffer);
|
|
if(nPrint) printf("\n> %s\n", szStmtBuffer) ;
|
|
retcode = SQLExecDirect(stHandles.hstmt, szStmtBuffer, SQL_NTS) ;
|
|
|
|
if(SQL_SUCCESS == retcode || SQL_SUCCESS_WITH_INFO == retcode){
|
|
}else{
|
|
p->nError = 1 ;
|
|
printf("UPDATE in thread %d failed\n", p->nThreadID) ;
|
|
HandleError(stHandles.hstmt, SQL_HANDLE_STMT) ;
|
|
}
|
|
}
|
|
break ;
|
|
|
|
|
|
/************************************** T_DELETE case **************************************/
|
|
case T_DELETE:
|
|
for(r = 0 ; r < nNoOfRows ; ++r){
|
|
sprintf((char*)szStmtBuffer, "DELETE * FROM %s WHERE COL0 = %d", p->szTableName, pRef[nNoOfCol*r]) ;
|
|
if(nPrint) printf("\n> %s\n", szStmtBuffer) ;
|
|
retcode = SQLExecDirect(stHandles.hstmt, szStmtBuffer, SQL_NTS) ;
|
|
if(SQL_SUCCESS == retcode || SQL_SUCCESS_WITH_INFO == retcode){
|
|
}else if( 1 == p->nVerifyFlag && SQL_NO_DATA != retcode){
|
|
p->nError = 1 ;
|
|
printf("\nVerification failed: the row found\n") ;
|
|
}else{
|
|
p->nError = 1 ;
|
|
printf("INSERT in thread %d failed\n", p->nThreadID) ;
|
|
HandleError(stHandles.hstmt, SQL_HANDLE_STMT) ;
|
|
}
|
|
|
|
}
|
|
break ;
|
|
|
|
|
|
/************************************** default case **************************************/
|
|
default:
|
|
break ;
|
|
}//switch
|
|
p->thread_status = S_IDLE ;
|
|
} //for
|
|
|
|
free((void*)pBindBuffer) ;
|
|
GetHandles(&stHandles, FREE, 0) ;
|
|
p->thread_status = S_EXIT ;
|
|
return 0 ;
|
|
};
|
|
|
|
|
|
|
|
/*************************************************
|
|
Function: ThreadFnFloat - thread function
|
|
for float attributes
|
|
*************************************************/
|
|
void* ThreadFnFloat(void* pparams){
|
|
|
|
SQLRETURN retcode = SQL_ERROR ;
|
|
SQLCHAR szStmtBuffer[MAX_SQL_STMT] = { 0 } ;
|
|
SQLCHAR szValueBuffer[MAX_VALUE_LEN] = { 0 } ;
|
|
SQLCHAR szAuxBuffer[MAX_STR_LEN] = { 0 } ;
|
|
SQLCHAR szColBuffer[MAX_COL_NAME] = { 0 } ;
|
|
SQLINTEGER cbFloat = 0 ;
|
|
ODBC_HANDLES stHandles ;
|
|
memset(&stHandles, 0, sizeof(ODBC_HANDLES)) ;
|
|
|
|
int r = 0, j = 0 ;
|
|
//Get thread parameters
|
|
PARAMS* p = (PARAMS*)pparams ;
|
|
|
|
float* pRef = (float*)p->pThreadRef ;
|
|
float* pBindBuffer = (float*)malloc(sizeof(float)*nNoOfCol) ;
|
|
|
|
//printf("Thread #%d\n", p->nThreadID) ;
|
|
|
|
retcode = GetHandles(&stHandles, GET, 0) ;
|
|
|
|
if (SQL_SUCCESS == retcode || SQL_SUCCESS_WITH_INFO == retcode ) {
|
|
p->report_status = S_STARTED ;
|
|
}else{
|
|
printf("Thread #%d failed to allocate handles, exiting now.\n", p->nThreadID) ;
|
|
free((void*)pBindBuffer) ;
|
|
p->nError = 1 ;
|
|
p->report_status = S_EXIT ;
|
|
return 0 ;
|
|
}
|
|
|
|
//p->report_status = S_STARTED ;
|
|
|
|
//Main thread loop
|
|
for(;;){
|
|
|
|
while(S_IDLE == p->thread_status){
|
|
NdbSleep_MilliSleep(1) ;
|
|
}
|
|
|
|
if(S_STOP == p->thread_status) {
|
|
break ;
|
|
}else{
|
|
p->thread_status = S_BUSY ;
|
|
}
|
|
|
|
switch(p->op_type){
|
|
|
|
|
|
/************************************** T_INSERT case **************************************/
|
|
case T_INSERT:
|
|
|
|
for(r = 0 ; r < nNoOfRows ; ++r){
|
|
|
|
if(!nColList){
|
|
sprintf((char*)szStmtBuffer, "INSERT INTO %s VALUES(", p->szTableName) ;
|
|
}else{
|
|
sprintf((char*)szStmtBuffer, "INSERT INTO %s (%s) VALUES(", p->szTableName, szColNames) ;
|
|
}
|
|
|
|
//sprintf((char*)szStmtBuffer, "INSERT INTO %s VALUES(", p->szTableName) ;
|
|
|
|
for(j = 0 ;;){
|
|
sprintf((char*)szValueBuffer,"%f", pRef[nNoOfCol*r + j]) ;
|
|
strncat((char*)szStmtBuffer, (char*)szValueBuffer, strlen((const char*)szValueBuffer)) ;
|
|
++j ;
|
|
if(nNoOfCol == j) break ;
|
|
strcat((char*)szStmtBuffer, ", ") ;
|
|
}
|
|
strcat((char*)szStmtBuffer, ")") ;
|
|
if(nPrint) printf("\n> %s\n", szStmtBuffer) ;
|
|
retcode = SQLExecDirect(stHandles.hstmt, szStmtBuffer, SQL_NTS) ;
|
|
if(SQL_SUCCESS == retcode || SQL_SUCCESS_WITH_INFO == retcode){
|
|
}else{
|
|
p->nError = 1 ;
|
|
printf("INSERT in thread #%d failed\n", p->nThreadID) ;
|
|
HandleError(stHandles.hstmt, SQL_HANDLE_STMT) ;
|
|
}
|
|
}
|
|
break ;
|
|
|
|
|
|
/************************************** T_READ case **************************************/
|
|
case T_READ:
|
|
|
|
for(r = 0 ; r < nNoOfRows ; ++r){
|
|
|
|
sprintf((char*)szStmtBuffer, "SELECT * FROM %s WHERE COL0 = %f", p->szTableName, pRef[nNoOfCol*r]) ;
|
|
if(nPrint) printf("\n> %s\n", szStmtBuffer) ;
|
|
ODBC_FN(SQLExecDirect(stHandles.hstmt, (SQLCHAR*)szStmtBuffer, SQL_NTS), retcode) ;
|
|
|
|
for(j = 0 ; j < nNoOfCol ; ++j){
|
|
ODBC_FN(SQLBindCol(stHandles.hstmt, (j+1), SQL_C_FLOAT, (void*)&pBindBuffer[j], sizeof(SQLFLOAT), &cbFloat), retcode) ;
|
|
}
|
|
|
|
for (;;) {
|
|
retcode = SQLFetch(stHandles.hstmt);
|
|
|
|
if (SQL_SUCCESS == retcode || SQL_SUCCESS_WITH_INFO == retcode){
|
|
for(int k = 0 ; k < nNoOfCol ; ++k){
|
|
if(p->nVerifyFlag){
|
|
if(abs(pBindBuffer[k] - pRef[nNoOfCol*r + k]) > FLTDEV )
|
|
printf("Expected: %f Actual: %f\n", pBindBuffer[k], pRef[nNoOfCol*r + k]) ;
|
|
}
|
|
}
|
|
}else if(SQL_NO_DATA == retcode){
|
|
break ;
|
|
}else{
|
|
p->nError = 1 ;
|
|
printf("READ in thread #%d failed\n", p->nThreadID) ;
|
|
HandleError(stHandles.hstmt, SQL_HANDLE_STMT) ;
|
|
}
|
|
//printf("\n") ;
|
|
}
|
|
SQLCloseCursor(stHandles.hstmt) ;
|
|
}
|
|
break ;
|
|
|
|
|
|
/************************************** T_UPDATE case **************************************/
|
|
case T_UPDATE:
|
|
for(r = 0 ; r < nNoOfRows ; ++r){
|
|
|
|
sprintf((char*)szStmtBuffer, "UPDATE %s SET ", p->szTableName) ;
|
|
for(j = 1 ;;){
|
|
pRef[nNoOfCol*r + j] = pRef[nNoOfCol*r + j] + UPDATE_VALUE ;
|
|
sprintf((char*)szColBuffer,"COL%d = %f", j, pRef[nNoOfCol*r + j]) ;
|
|
strncat((char*)szStmtBuffer, (char*)szColBuffer, strlen((char*)szColBuffer)) ;
|
|
++j ;
|
|
if(nNoOfCol == j) break ;
|
|
strcat((char*)szStmtBuffer, ", ") ;
|
|
}
|
|
sprintf((char*)szAuxBuffer, " WHERE COL0 = %f ;", pRef[nNoOfCol*r]) ;
|
|
strcat((char*)szStmtBuffer, (char*)szAuxBuffer);
|
|
if(nPrint) printf("\n> %s\n", szStmtBuffer) ;
|
|
retcode = SQLExecDirect(stHandles.hstmt, szStmtBuffer, SQL_NTS) ;
|
|
if(SQL_SUCCESS == retcode || SQL_SUCCESS_WITH_INFO == retcode){
|
|
}else{
|
|
p->nError = 1 ;
|
|
printf("UPDATE in thread #%d failed\n", p->nThreadID) ;
|
|
HandleError(stHandles.hstmt, SQL_HANDLE_STMT) ;
|
|
}
|
|
}
|
|
break ;
|
|
|
|
|
|
/************************************** T_DELETE case **************************************/
|
|
case T_DELETE:
|
|
for(r = 0 ; r < nNoOfRows ; ++r){
|
|
sprintf((char*)szStmtBuffer, "DELETE * FROM %s WHERE COL0 = %f", p->szTableName, pRef[nNoOfCol*r]) ;
|
|
if(nPrint) printf("\n> %s\n", szStmtBuffer) ;
|
|
retcode = SQLExecDirect(stHandles.hstmt, (SQLCHAR*)szStmtBuffer, SQL_NTS) ;
|
|
if(SQL_SUCCESS == retcode || SQL_SUCCESS_WITH_INFO == retcode){
|
|
}else if( 1 == p->nVerifyFlag && SQL_NO_DATA != retcode){
|
|
p->nError = 1 ;
|
|
printf("\nVerification failed: still row exists\n") ;
|
|
}else{
|
|
p->nError = 1 ;
|
|
printf("DELETE in thread #%d failed\n", p->nThreadID) ;
|
|
HandleError(stHandles.hstmt, SQL_HANDLE_STMT) ;
|
|
}
|
|
}
|
|
break ;
|
|
|
|
|
|
/************************************** default case **************************************/
|
|
default:
|
|
break ;
|
|
}//switch
|
|
p->thread_status = S_IDLE ;
|
|
} //for
|
|
|
|
free((void*)pBindBuffer) ;
|
|
GetHandles(&stHandles, FREE, 0) ;
|
|
p->thread_status = S_EXIT ;
|
|
return 0 ;
|
|
};
|
|
|
|
|
|
|
|
/*************************************************
|
|
Function: ThreadFnDouble - thread function
|
|
for double attributes
|
|
*************************************************/
|
|
/*
|
|
void* ThreadFnDouble(void* pparams){
|
|
|
|
SQLRETURN retcode = SQL_ERROR ;
|
|
SQLCHAR szStmtBuffer[MAX_SQL_STMT] = { 0 } ;
|
|
SQLCHAR szValueBuffer[MAX_VALUE_LEN] = { 0 } ;
|
|
SQLCHAR szAuxBuffer[MAX_STR_LEN] = { 0 } ;
|
|
SQLCHAR szColBuffer[MAX_COL_NAME] = { 0 } ;
|
|
SQLINTEGER cbDouble = 0 ;
|
|
ODBC_HANDLES stHandles ;
|
|
memset(&stHandles, 0, sizeof(ODBC_HANDLES)) ;
|
|
int r = 0, j = 0 ;
|
|
|
|
//Get thread parameters
|
|
PARAMS* p = (PARAMS*)pparams ;
|
|
double* pRef = (double*)p->pThreadRef ;
|
|
|
|
double* pBindBuffer = (double*)malloc(sizeof(double)*nNoOfCol) ;
|
|
|
|
//printf("Thread #%d\n", p->nThreadID) ;
|
|
|
|
retcode = GetHandles(&stHandles, GET, 0) ;
|
|
|
|
if (SQL_SUCCESS == retcode || SQL_SUCCESS_WITH_INFO == retcode ) {
|
|
p->report_status = S_STARTED ;
|
|
}else{
|
|
printf("Thread #%d failed to allocate handles, exiting now.\n", p->nThreadID) ;
|
|
free((void*)pBindBuffer) ;
|
|
p->report_status = S_EXIT ;
|
|
return 0 ;
|
|
}
|
|
//p->report_status = S_STARTED ;
|
|
|
|
//Main thread loop
|
|
for(;;){
|
|
|
|
while(S_IDLE == p->thread_status){
|
|
NdbSleep_MilliSleep(1) ;
|
|
}
|
|
|
|
if(S_STOP == p->thread_status) {
|
|
break ;
|
|
}else{
|
|
p->thread_status = S_BUSY ;
|
|
}
|
|
|
|
switch(p->op_type){
|
|
|
|
|
|
/************************************** T_INSERT case **************************************/
|
|
/* case T_INSERT:
|
|
|
|
for(r = 0 ; r < nNoOfRows ; ++r){
|
|
sprintf((char*)szStmtBuffer, "INSERT INTO %s VALUES(", p->szTableName) ;
|
|
for(j = 0 ;;){
|
|
sprintf((char*)szValueBuffer,"%.9f", pRef[nNoOfCol*r + j]) ;
|
|
strncat((char*)szStmtBuffer, (char*)szValueBuffer, strlen((const char*)szValueBuffer)) ;
|
|
++j ;
|
|
if(nNoOfCol == j) break ;
|
|
strcat((char*)szStmtBuffer, ", ") ;
|
|
}
|
|
strcat((char*)szStmtBuffer, ")") ;
|
|
ODBC_FN(SQLExecDirect(stHandles.hstmt, szStmtBuffer, SQL_NTS), retcode) ;
|
|
}
|
|
|
|
break ;
|
|
|
|
|
|
/************************************** T_READ case **************************************/
|
|
/* case T_READ:
|
|
|
|
for(r = 0 ; r < nNoOfRows ; ++r){
|
|
sprintf((char*)szStmtBuffer, "SELECT * FROM %s WHERE COL0 = %.9f", p->szTableName, pRef[nNoOfCol*r]) ;
|
|
ODBC_FN(SQLExecDirect(stHandles.hstmt, (SQLCHAR*)szStmtBuffer, SQL_NTS), retcode) ;
|
|
for(j = 0 ; j < nNoOfCol ; ++j){
|
|
ODBC_FN(SQLBindCol(stHandles.hstmt, (j+1), SQL_C_DOUBLE, (void*)&pBindBuffer[j], sizeof(SQLDOUBLE), &cbDouble), retcode) ;
|
|
}
|
|
for (;;) {
|
|
retcode = SQLFetch(stHandles.hstmt);
|
|
|
|
if (SQL_SUCCESS == retcode || SQL_SUCCESS_WITH_INFO == retcode){
|
|
for(int k = 0 ; k < nNoOfCol ; ++k){
|
|
if(p->nVerifyFlag){
|
|
if(abs(pBindBuffer[k] - pRef[nNoOfCol*r + k]) > DBLDEV)
|
|
printf("Expected: %.9f Actual: %.9f\n", pBindBuffer[k], pRef[nNoOfCol*r + k]) ;
|
|
}
|
|
}
|
|
}else if(SQL_NO_DATA == retcode){
|
|
break ;
|
|
}else{
|
|
HandleError(stHandles.hstmt, SQL_HANDLE_STMT) ;
|
|
}
|
|
//printf("\n") ;
|
|
}
|
|
SQLCloseCursor(stHandles.hstmt) ;
|
|
}
|
|
break ;
|
|
|
|
|
|
/************************************** T_UPDATE case **************************************/
|
|
/* case T_UPDATE:
|
|
for(r = 0 ; r < nNoOfRows ; ++r){
|
|
|
|
sprintf((char*)szStmtBuffer, "UPDATE %s SET ", p->szTableName) ;
|
|
for(j = 1 ;;){
|
|
pRef[nNoOfCol*r + j] = pRef[nNoOfCol*r + j] + UPDATE_VALUE ;
|
|
sprintf((char*)szColBuffer,"COL%d = %.9f", j, pRef[nNoOfCol*r + j]) ;
|
|
strncat((char*)szStmtBuffer, (char*)szColBuffer, strlen((char*)szColBuffer)) ;
|
|
++j ;
|
|
if(nNoOfCol == j) break ;
|
|
strcat((char*)szStmtBuffer, ", ") ;
|
|
}
|
|
sprintf((char*)szAuxBuffer, " WHERE COL0 = %.9f ;", pRef[nNoOfCol*r]) ;
|
|
strcat((char*)szStmtBuffer, (char*)szAuxBuffer);
|
|
ODBC_FN(SQLExecDirect(stHandles.hstmt, szStmtBuffer, SQL_NTS), retcode) ;
|
|
}
|
|
break ;
|
|
|
|
|
|
/************************************** T_DELETE case **************************************/
|
|
/* case T_DELETE:
|
|
for(r = 0 ; r < nNoOfRows ; ++r){
|
|
sprintf((char*)szStmtBuffer, "DELETE FROM %s WHERE COL0 = %.9f", p->szTableName, pRef[nNoOfCol*r]) ;
|
|
retcode = SQLExecDirect(stHandles.hstmt, (SQLCHAR*)szStmtBuffer, SQL_NTS) ;
|
|
if( 1 == p->nVerifyFlag && SQL_NO_DATA != retcode ){
|
|
printf("\nVerification failed: still row exists\n") ;
|
|
}
|
|
}
|
|
break ;
|
|
|
|
|
|
/************************************** default case **************************************/
|
|
/* default:
|
|
break ;
|
|
}//switch
|
|
p->thread_status = S_IDLE ;
|
|
} //for
|
|
|
|
free((void*)pBindBuffer) ;
|
|
GetHandles(&stHandles, FREE, 0) ;
|
|
p->thread_status = S_EXIT ;
|
|
return 0 ;
|
|
};
|
|
|
|
|
|
|
|
/*************************************************
|
|
Function: ThreadFnChar - thread function
|
|
for character attributes
|
|
*************************************************/
|
|
void* ThreadFnChar(void* pparams){
|
|
|
|
SQLRETURN retcode = SQL_ERROR ;
|
|
SQLCHAR szStmtBuffer[MAX_SQL_STMT] = { 0 } ;
|
|
SQLCHAR szValueBuffer[MAX_VALUE_LEN] = { 0 } ;
|
|
SQLCHAR szAuxBuffer[MAX_STR_LEN] = { 0 } ;
|
|
SQLCHAR szColBuffer[MAX_COL_NAME] = { 0 } ;
|
|
SQLINTEGER cbChar = 0 ;
|
|
ODBC_HANDLES stHandles ;
|
|
memset(&stHandles, 0, sizeof(ODBC_HANDLES)) ;
|
|
int r = 0, j = 0 ;
|
|
|
|
//Get thread parameters
|
|
PARAMS* p = (PARAMS*)pparams ;
|
|
char* pRef = (char*)p->pThreadRef ;
|
|
char* pBindBuffer = (char*)malloc(sizeof(char)*nNoOfCol*MAX_CHAR_ATTR_LEN) ;
|
|
|
|
//printf("Thread #%d\n", p->nThreadID) ;
|
|
|
|
retcode = GetHandles(&stHandles, GET, 0) ;
|
|
|
|
if (SQL_SUCCESS == retcode || SQL_SUCCESS_WITH_INFO == retcode ) {
|
|
p->report_status = S_STARTED ;
|
|
}else{
|
|
printf("Thread #%d failed to allocate handles, retcode = %d, exiting now.\n", p->nThreadID, retcode) ;
|
|
p->nError = 1 ;
|
|
free((void*)pBindBuffer) ;
|
|
p->report_status = S_EXIT ;
|
|
return 0 ;
|
|
}
|
|
|
|
//Main thread loop
|
|
for(;;){
|
|
|
|
while(S_IDLE == p->thread_status){
|
|
NdbSleep_MilliSleep(1) ;
|
|
}
|
|
|
|
if(S_STOP == p->thread_status) {
|
|
break ;
|
|
}else{
|
|
p->thread_status = S_BUSY ;
|
|
}
|
|
|
|
switch(p->op_type){
|
|
|
|
|
|
/************************************** T_INSERT case **************************************/
|
|
case T_INSERT:
|
|
|
|
for(r = 0 ; r < nNoOfRows ; ++r){
|
|
memset(szStmtBuffer, 0, strlen(szStmtBuffer)) ;
|
|
if(!nColList){
|
|
sprintf((char*)szStmtBuffer, "INSERT INTO %s VALUES(", p->szTableName) ;
|
|
}else{
|
|
sprintf((char*)szStmtBuffer, "INSERT INTO %s (%s) VALUES(", p->szTableName, szColNames) ;
|
|
}
|
|
|
|
for(j = 0 ;;){
|
|
sprintf((char*)szValueBuffer,"'%s'", (char*)(pRef + nNoOfCol*r*MAX_CHAR_ATTR_LEN*sizeof(char) + j*MAX_CHAR_ATTR_LEN*sizeof(char))) ;
|
|
strncat((char*)szStmtBuffer, (char*)szValueBuffer, strlen((const char*)szValueBuffer)) ;
|
|
++j ;
|
|
if(nNoOfCol == j) break ;
|
|
strcat((char*)szStmtBuffer, ", ") ;
|
|
}
|
|
strcat((char*)szStmtBuffer, ")") ;
|
|
|
|
if(nPrint) printf("\n> %s\n", szStmtBuffer) ;
|
|
retcode = SQLExecDirect(stHandles.hstmt, szStmtBuffer, SQL_NTS) ;
|
|
if(SQL_SUCCESS == retcode || SQL_SUCCESS_WITH_INFO == retcode){
|
|
}else{
|
|
p->nError = 1 ;
|
|
printf("INSERT in thread #%d failed\n", p->nThreadID) ;
|
|
HandleError(stHandles.hstmt, SQL_HANDLE_STMT) ;
|
|
}
|
|
}
|
|
|
|
break ;
|
|
|
|
|
|
/************************************** T_READ case **************************************/
|
|
case T_READ:
|
|
|
|
for(r = 0 ; r < nNoOfRows ; ++r){
|
|
sprintf((char*)szStmtBuffer, "SELECT * FROM %s WHERE COL0 = '%s'", p->szTableName, (char*)(pRef + nNoOfCol*r*MAX_CHAR_ATTR_LEN*sizeof(char))) ;
|
|
if(nPrint) printf("\n> %s\n", szStmtBuffer) ;
|
|
ODBC_FN(SQLExecDirect(stHandles.hstmt, (SQLCHAR*)szStmtBuffer, SQL_NTS), retcode) ;
|
|
for(j = 0 ; j < nNoOfCol ; ++j){
|
|
ODBC_FN(SQLBindCol(stHandles.hstmt, (j+1), SQL_C_CHAR, (void*)(pBindBuffer+j*MAX_CHAR_ATTR_LEN*sizeof(char)), MAX_CHAR_ATTR_LEN, &cbChar), retcode) ;
|
|
}
|
|
for (;;) {
|
|
retcode = SQLFetch(stHandles.hstmt);
|
|
|
|
if (SQL_SUCCESS == retcode || SQL_SUCCESS_WITH_INFO == retcode){
|
|
for(int k = 0 ; k < nNoOfCol ; ++k){
|
|
if(p->nVerifyFlag){
|
|
if(!strcmp((char*)(pBindBuffer + k*MAX_CHAR_ATTR_LEN*sizeof(char)), (char*)(pRef + nNoOfCol*r*MAX_CHAR_ATTR_LEN*sizeof(char) + k*MAX_CHAR_ATTR_LEN*sizeof(char))))
|
|
printf("Expected: %s Actual: %s\n", (char*)(pBindBuffer + k*MAX_CHAR_ATTR_LEN*sizeof(char)), (char*)(pRef + nNoOfCol*r*MAX_CHAR_ATTR_LEN*sizeof(char) + k*MAX_CHAR_ATTR_LEN*sizeof(char))) ;
|
|
}
|
|
}
|
|
}else if(SQL_NO_DATA == retcode){
|
|
break ;
|
|
}else{
|
|
p->nError = 1 ;
|
|
printf("READ in thread #%d failed\n", p->nThreadID) ;
|
|
HandleError(stHandles.hstmt, SQL_HANDLE_STMT) ;
|
|
}
|
|
//printf("\n") ;
|
|
}
|
|
SQLCloseCursor(stHandles.hstmt) ;
|
|
}
|
|
break ;
|
|
|
|
|
|
/************************************** T_UPDATE case **************************************/
|
|
case T_UPDATE:
|
|
for(r = 0 ; r < nNoOfRows ; ++r){
|
|
sprintf((char*)szStmtBuffer, "UPDATE %s SET ", p->szTableName) ;
|
|
for(j = 1 ;;){
|
|
swab((char*)(pRef + nNoOfCol*r*MAX_CHAR_ATTR_LEN*sizeof(char) + j*MAX_CHAR_ATTR_LEN*sizeof(char)), (char*)szColBuffer, MAX_CHAR_ATTR_LEN*sizeof(char)) ;
|
|
memcpy((void*)(pRef + nNoOfCol*r*MAX_CHAR_ATTR_LEN*sizeof(char) + j*MAX_CHAR_ATTR_LEN*sizeof(char)), (void*)szColBuffer, MAX_CHAR_ATTR_LEN*sizeof(char)) ;
|
|
sprintf((char*)szColBuffer,"COL%d = '%s'", j, (char*)(pRef + nNoOfCol*r*MAX_CHAR_ATTR_LEN*sizeof(char) + j*MAX_CHAR_ATTR_LEN*sizeof(char))) ;
|
|
strncat((char*)szStmtBuffer, (char*)szColBuffer, strlen((char*)szColBuffer)) ;
|
|
++j ;
|
|
if(nNoOfCol == j) break ;
|
|
strcat((char*)szStmtBuffer, ", ") ;
|
|
}
|
|
sprintf( (char*)szAuxBuffer, " WHERE COL0 = '%s';", (char*)(pRef + nNoOfCol*r*MAX_CHAR_ATTR_LEN*sizeof(char)) ) ;
|
|
strcat((char*)szStmtBuffer, (char*)szAuxBuffer) ;
|
|
if(nPrint) printf("\n> %s\n", szStmtBuffer) ;
|
|
retcode = SQLExecDirect(stHandles.hstmt, szStmtBuffer, SQL_NTS) ;
|
|
if(SQL_SUCCESS == retcode || SQL_SUCCESS_WITH_INFO == retcode){
|
|
}else{
|
|
p->nError = 1 ;
|
|
printf("UPDATE in thread #%d failed\n", p->nThreadID) ;
|
|
HandleError(stHandles.hstmt, SQL_HANDLE_STMT) ;
|
|
}
|
|
}
|
|
break ;
|
|
|
|
|
|
/************************************** T_DELETE case **************************************/
|
|
case T_DELETE:
|
|
for(r = 0 ; r < nNoOfRows ; ++r){
|
|
sprintf((char*)szStmtBuffer, "DELETE FROM %s WHERE COL0 = '%s\'", p->szTableName, (char*)(pRef + nNoOfCol*r*MAX_CHAR_ATTR_LEN*sizeof(char))) ;
|
|
if(nPrint) printf("\n> %s\n", szStmtBuffer) ;
|
|
retcode = SQLExecDirect(stHandles.hstmt, szStmtBuffer, SQL_NTS) ;
|
|
if(SQL_SUCCESS == retcode || SQL_SUCCESS_WITH_INFO == retcode){
|
|
}else if(1 == p->nVerifyFlag && SQL_NO_DATA != retcode){
|
|
p->nError = 1 ;
|
|
printf("\nVerification failed: still row exists\n") ;
|
|
}else{
|
|
p->nError = 1 ;
|
|
printf("INSERT in thread #%d failed\n", p->nThreadID) ;
|
|
HandleError(stHandles.hstmt, SQL_HANDLE_STMT) ;
|
|
}
|
|
}
|
|
break ;
|
|
|
|
|
|
/************************************** default case **************************************/
|
|
default:
|
|
break ;
|
|
}//switch
|
|
p->thread_status = S_IDLE ;
|
|
} //for
|
|
|
|
free((void*)pBindBuffer) ;
|
|
GetHandles(&stHandles, FREE, 0) ;
|
|
p->thread_status = S_EXIT ;
|
|
return 0 ;
|
|
};
|
|
|
|
|
|
|
|
/*************************************************
|
|
Function: CreateDemoTable
|
|
*************************************************/
|
|
SQLRETURN CreateDemoTables(char* szTableName, int nTables, table_opt op){
|
|
|
|
SQLRETURN retcode = SQL_ERROR ;
|
|
SQLCHAR szStmtBuffer[MAX_SQL_STMT] = { 0 } ;
|
|
SQLCHAR szColBuffer[MAX_COL_NAME] = { 0 } ;
|
|
SQLCHAR szAuxBuffer[32] = { 0 } ;
|
|
ODBC_HANDLES stHandles ;
|
|
memset(&stHandles, 0, sizeof(ODBC_HANDLES)) ;
|
|
int c = 0 ;
|
|
|
|
GetHandles(&stHandles, GET, 0) ;
|
|
|
|
if(CREATE == op){
|
|
|
|
for(c = 0; c < nTables ; ++c){
|
|
sprintf((char*)szStmtBuffer, "CREATE TABLE %s (", (char*)(szTableName+MAX_TABLE_NAME*c)) ;
|
|
int j = 0 ;
|
|
for(;;){
|
|
sprintf((char*)szColBuffer, "COL%d ", j) ;
|
|
strcat((char*)szStmtBuffer, (char*)szColBuffer) ;
|
|
++j ;
|
|
|
|
switch(AttributeType){
|
|
case T_INT:
|
|
strcat((char*)szStmtBuffer, "INTEGER") ;
|
|
break ;
|
|
case T_FLOAT:
|
|
strcat((char*)szStmtBuffer, "FLOAT") ;
|
|
break ;
|
|
|
|
/* case T_DOUBLE:
|
|
strcat((char*)szStmtBuffer, "DOUBLE") ;
|
|
break ;
|
|
*/
|
|
case T_CHAR:
|
|
sprintf((char*)szAuxBuffer, "CHAR(%d)", MAX_CHAR_ATTR_LEN) ;
|
|
strcat((char*)szStmtBuffer, (char*)szAuxBuffer) ;
|
|
break ;
|
|
default:
|
|
break ;
|
|
}
|
|
|
|
if(nNoOfCol <= j){
|
|
strcat((char*)szStmtBuffer, ")") ;
|
|
break ;
|
|
}
|
|
strcat((char*)szStmtBuffer, ", ") ;
|
|
} //for(;;)
|
|
|
|
|
|
if(nPrint) printf("\n> %s\n", szStmtBuffer) ;
|
|
ODBC_FN(SQLExecDirect(stHandles.hstmt, szStmtBuffer, SQL_NTS), retcode) ;
|
|
if(SQL_SUCCESS != retcode) HandleError(stHandles.hstmt , SQL_HANDLE_STMT) ;
|
|
|
|
|
|
}// for()
|
|
|
|
}else{
|
|
|
|
for(c = 0 ; c < nTables ; ++c){
|
|
sprintf((char*)szStmtBuffer, "DROP TABLE %s ", (char*)(szTableName + MAX_TABLE_NAME*c)) ;
|
|
//ODBC_FN(SQLExecDirect(stHandles.hstmt, szStmtBuffer, SQL_NTS), retcode) ;
|
|
if(nPrint) printf("\n> %s\n", szStmtBuffer) ;
|
|
retcode = SQLExecDirect(stHandles.hstmt, szStmtBuffer, SQL_NTS) ;
|
|
}
|
|
|
|
}
|
|
|
|
GetHandles(&stHandles, FREE, 0) ;
|
|
|
|
return retcode ;
|
|
}
|
|
|
|
|
|
|
|
/*************************************************
|
|
Function: AssignTableNames()
|
|
*************************************************/
|
|
inline void AssignTableNames(char* szBuffer, int nTables){
|
|
for(int c = 0 ; c < nTables ; ++c){
|
|
sprintf((char*)(szBuffer + MAX_TABLE_NAME*sizeof(char)*c), "TAB%d", c) ;
|
|
}
|
|
return ;
|
|
}
|
|
|
|
|
|
|
|
|
|
/*************************************************
|
|
Function: StartThreads()
|
|
*************************************************/
|
|
|
|
inline void StartThreads(PARAMS* p, void* pRef, int nTables, char* szTables, attr_type attrType, UintPtr* pHandles) {
|
|
|
|
int* pInt = NULL ;
|
|
float* pFloat = NULL ;
|
|
double* pDouble = NULL ;
|
|
char* pChar = NULL ;
|
|
UintPtr pTmpThread = NULL ;
|
|
|
|
bool bFlap = 1 ;
|
|
for(int f = 0 ; f < nNoOfThreads ; ++f){
|
|
p[f].nThreadID = f ;
|
|
p[f].nError = 0 ;
|
|
p[f].thread_status = S_IDLE ;
|
|
p[f].op_type = T_WAIT ;
|
|
if(bFlap){
|
|
strncpy((char*)p[f].szTableName, (char*)szTables, MAX_TABLE_NAME) ;
|
|
}else{
|
|
strncpy((char*)p[f].szTableName, (char*)(szTables + MAX_TABLE_NAME*sizeof(char)), MAX_TABLE_NAME) ;
|
|
}
|
|
bFlap = !bFlap ;
|
|
//pTmpThread = pHandles[ ;
|
|
|
|
switch(attrType){
|
|
case T_INT:
|
|
pInt = (int*)pRef ;
|
|
p[f].pThreadRef = (void*)&pInt[nNoOfRows*nNoOfCol*f] ;
|
|
pHandles[f] = (UintPtr)NdbThread_Create(ThreadFnInt, (void**)&p[f], 32768, "SQL99_test", NDB_THREAD_PRIO_MEAN) ;
|
|
break ;
|
|
case T_FLOAT:
|
|
pFloat = (float*)pRef ;
|
|
p[f].pThreadRef = (void*)&pFloat[nNoOfRows*nNoOfCol*f] ;
|
|
pHandles[f] = (UintPtr)NdbThread_Create(ThreadFnFloat, (void**)&p[f], 32768, "SQL99_test", NDB_THREAD_PRIO_MEAN) ;
|
|
break ;
|
|
/*
|
|
case T_DOUBLE:
|
|
pDouble = (double*)pRef ;
|
|
p[f].pThreadRef = (void*)&pDouble[nNoOfRows*nNoOfCol*f] ;
|
|
pHandles[f] = (UintPtr)NdbThread_Create(ThreadFnDouble, (void**)&p[f], 32768, "SQL99_test", NDB_THREAD_PRIO_MEAN) ;
|
|
break ;
|
|
*/
|
|
case T_CHAR:
|
|
pChar = (char*)pRef ;
|
|
p[f].pThreadRef = (void*)&pChar[nNoOfRows*nNoOfCol*f*MAX_CHAR_ATTR_LEN] ;
|
|
pHandles[f] = (UintPtr)NdbThread_Create(ThreadFnChar, (void**)&p[f], 32768, "SQL99_test", NDB_THREAD_PRIO_MEAN) ;
|
|
default:
|
|
break ;
|
|
}
|
|
while(!(S_STARTED != p[f].report_status || S_EXIT != p[f].report_status)){
|
|
NdbSleep_MilliSleep(1) ;
|
|
}
|
|
}
|
|
return ;
|
|
}
|
|
|
|
|
|
|
|
/*************************************************
|
|
Function: SetThreadOperationType()
|
|
*************************************************/
|
|
inline void SetThreadOperationType(PARAMS* p, type op){
|
|
|
|
for(int e = 0 ; e < nNoOfThreads ; ++e){
|
|
p[e].nVerifyFlag = 0 ;
|
|
if(T_READ_VERIFY == op){
|
|
p[e].nVerifyFlag = 1 ;
|
|
p[e].op_type = T_READ ;
|
|
}else if(T_DELETE_VERIFY == op){
|
|
p[e].nVerifyFlag = 1 ;
|
|
p[e].op_type = T_DELETE ;
|
|
}else{
|
|
p[e].op_type = op ;
|
|
}
|
|
p[e].thread_status = S_GET_BUSY ;
|
|
}
|
|
return ;
|
|
}
|
|
|
|
|
|
|
|
/*************************************************
|
|
Function: WaitForThreads()
|
|
*************************************************/
|
|
inline int WaitForThreads(PARAMS* p) {
|
|
|
|
int ret_value = 0 ;
|
|
for(int w = 0 ; w < nNoOfThreads ; ++w){
|
|
while(!(S_IDLE != p[w].thread_status || S_EXIT != p[w].report_status)) {
|
|
NdbSleep_MilliSleep(1) ;
|
|
}
|
|
ret_value += p[w].nError ;
|
|
}
|
|
return ret_value ;
|
|
}
|
|
|
|
|
|
|
|
/*************************************************
|
|
Function: StopThreads()
|
|
*************************************************/
|
|
inline void StopThreads(PARAMS* p, UintPtr* pHandles) {
|
|
|
|
for(int k = 0 ; k < nNoOfThreads ; ++k){
|
|
while(!(S_IDLE != p[k].thread_status || S_EXIT != p[k].report_status)){
|
|
NdbSleep_MilliSleep(1) ;
|
|
}
|
|
p[k].thread_status = S_STOP ;
|
|
while(!(S_EXIT != p[k].thread_status || S_EXIT != p[k].report_status)){
|
|
NdbSleep_MilliSleep(1) ;
|
|
}
|
|
NdbThread_Destroy((NdbThread**)&pHandles[k]) ;
|
|
}
|
|
|
|
return ;
|
|
}
|
|
|
|
|
|
|
|
/*************************************************
|
|
Function: PrintAll()
|
|
*************************************************/
|
|
inline void PrintAll(char* szTableName, int nTables, attr_type attrType){
|
|
|
|
SQLRETURN retcode = SQL_ERROR ;
|
|
SQLCHAR* szStmt[MAX_SQL_STMT] = { 0 } ;
|
|
ODBC_HANDLES stHandles ;
|
|
memset(&stHandles, 0, sizeof(ODBC_HANDLES)) ;
|
|
double* pDoubleBuffer = NULL ;
|
|
char* pCharBuffer = NULL ;
|
|
|
|
if(T_CHAR != attrType){
|
|
pDoubleBuffer = (double*)malloc(sizeof(double)*nNoOfCol) ;
|
|
}else{
|
|
pCharBuffer = (char*)malloc(sizeof(char)*nNoOfCol*MAX_CHAR_ATTR_LEN) ;
|
|
}
|
|
|
|
SQLINTEGER cbLen = 0 ;
|
|
|
|
GetHandles(&stHandles, GET, 0) ;
|
|
|
|
for(int c = 0 ; c < nTables ; ++c){
|
|
|
|
int nCol = 0, nRows = 0 ;
|
|
|
|
printf("Table: \"%s\":\n------------------\n", (char*)(szTableName + MAX_TABLE_NAME*c*sizeof(char))) ;
|
|
|
|
sprintf((char*)szStmt, "SELECT * FROM %s", (char*)(szTableName + MAX_TABLE_NAME*c*sizeof(char))) ;
|
|
if(nPrint) printf("\n> %s\n", szStmt) ;
|
|
ODBC_FN(SQLExecDirect(stHandles.hstmt, (SQLCHAR*)szStmt, SQL_NTS), retcode) ;
|
|
|
|
for(int i = 0 ; i < nNoOfCol ; ++i){
|
|
|
|
if(T_CHAR != attrType){
|
|
ODBC_FN(SQLBindCol(stHandles.hstmt, (i+1), SQL_C_DOUBLE, (void*)&pDoubleBuffer[i], sizeof(SQLDOUBLE), &cbLen), retcode) ;
|
|
}else{
|
|
ODBC_FN(SQLBindCol(stHandles.hstmt, (i+1), SQL_C_CHAR, (void*)(pCharBuffer + i*MAX_CHAR_ATTR_LEN*sizeof(char)), MAX_CHAR_ATTR_LEN*sizeof(char), &cbLen), retcode) ;
|
|
}
|
|
nCol++ ;
|
|
|
|
}
|
|
|
|
int k = 0 ; //out of the <for> loop
|
|
for (;;) {
|
|
|
|
retcode = SQLFetch(stHandles.hstmt);
|
|
if (SQL_SUCCESS == retcode || SQL_SUCCESS_WITH_INFO == retcode ){
|
|
for(k = 0 ; k < nNoOfCol ; ++k){
|
|
if(T_CHAR != attrType){
|
|
ATTR_TYPE_SWITCH_T(pDoubleBuffer[k], AttributeType) ;
|
|
}else{
|
|
printf("%s\t", (char*)(pCharBuffer + k*MAX_CHAR_ATTR_LEN)) ;
|
|
}
|
|
}
|
|
}else if(SQL_NO_DATA == retcode){
|
|
if(0 == k){
|
|
printf("<empty>\n") ;
|
|
break ;
|
|
}else{
|
|
break ;
|
|
}
|
|
}else{
|
|
HandleError(stHandles.hstmt, SQL_HANDLE_STMT) ;
|
|
}
|
|
|
|
++nRows ;
|
|
printf("\n") ;
|
|
}
|
|
|
|
SQLCloseCursor(stHandles.hstmt) ;
|
|
|
|
printf("------------------\n") ;
|
|
printf("Rows: %d Columns: %d\n\n", nRows, nCol) ;
|
|
|
|
}
|
|
|
|
free((void*)pDoubleBuffer) ;
|
|
free((void*)pCharBuffer) ;
|
|
GetHandles(&stHandles, FREE, 0) ;
|
|
|
|
return ;
|
|
}
|
|
|
|
|
|
|
|
/*************************************************
|
|
Function: AssignRefCharValues()
|
|
*************************************************/
|
|
void AssignRefCharValues(char* pRef, bool bVerbose) {
|
|
|
|
int count = 0, rows = 0, nThreadOffset = 0, nRowOffset = 0 ;
|
|
char szStrBuffer[MAX_CHAR_ATTR_LEN] = { 0 } ;
|
|
int char_count = sizeof(szANSI)/sizeof(char) ;
|
|
|
|
for(int c = 0 ; c < nNoOfThreads ; ++c){
|
|
nThreadOffset = nNoOfRows*nNoOfCol*c*MAX_CHAR_ATTR_LEN*sizeof(char) ;
|
|
for(int d = 0 ; d < nNoOfRows ; ++d){
|
|
nRowOffset = nNoOfCol*d*MAX_CHAR_ATTR_LEN*sizeof(char) ; ++rows ;
|
|
for(int i = 0 ; i < nNoOfCol ; ++i){
|
|
for(int j = 0 ; j < (MAX_CHAR_ATTR_LEN - 2) ; ++j){
|
|
int h = (char)(rand() % (char_count-1)) ;
|
|
szStrBuffer[j] = szANSI[h] ;
|
|
}
|
|
szStrBuffer[MAX_CHAR_ATTR_LEN - 1] = '\0' ;
|
|
|
|
strcpy((char*)(pRef + nThreadOffset + nRowOffset + i*MAX_CHAR_ATTR_LEN*sizeof(char)), (char*)szStrBuffer) ;
|
|
count++ ;
|
|
if(bVerbose){
|
|
printf(" %s ", (char*)(pRef + nThreadOffset + nRowOffset + i*MAX_CHAR_ATTR_LEN*sizeof(char))) ;
|
|
}
|
|
}
|
|
if(bVerbose) {
|
|
printf("\n") ;
|
|
NdbSleep_MilliSleep(10) ;
|
|
}
|
|
}
|
|
}
|
|
|
|
if(bVerbose){
|
|
printf("_____________________") ;
|
|
printf("\nRows: %d Values: %d\n\n", rows, count) ;
|
|
}
|
|
|
|
return ;
|
|
}
|
|
|
|
|
|
/*
|
|
|
|
|
|
sprintf((char*)szStmtBuffer, "INSERT INTO %s VALUES(", p->szTableName) ;
|
|
for(j = 0 ;;){
|
|
strcat((char*)szStmtBuffer, "?") ;
|
|
++j ;
|
|
if(nNoOfCol == j) break ;
|
|
strcat((char*)szStmtBuffer, ", ") ;
|
|
}
|
|
strcat((char*)szStmtBuffer, ")") ;
|
|
|
|
ODBC_FN(SQLPrepare(stHandles.hstmt, szStmtBuffer, SQL_NTS), retcode) ;
|
|
|
|
for(j = 0 ; j < nNoOfCol ; ++j){
|
|
ODBC_FN(SQLBindParameter(stHandles.hstmt, (j+1), SQL_PARAM_INPUT, SQL_C_FLOAT, SQL_FLOAT, 0, 0, (void*)&pBindBuffer[j], 0, &cbFloat), retcode) ;
|
|
HandleError(stHandles.hstmt, SQL_HANDLE_STMT) ;
|
|
}
|
|
|
|
for(r = 0 ; r < nNoOfRows ; ++r){
|
|
for(j = 0 ; j < nNoOfCol ; ++j){
|
|
pBindBuffer[j] = pRef[nNoOfCol*r + j] ;
|
|
}
|
|
ODBC_FN(SQLExecute(stHandles.hstmt), retcode) ;
|
|
HandleError(stHandles.hstmt, SQL_HANDLE_STMT) ;
|
|
}
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
/*************************************************
|
|
Function: HandleError
|
|
*************************************************/
|
|
|
|
void HandleError(void* handle, SQLSMALLINT HandleType){
|
|
|
|
SQLCHAR szError[MAX_STR_LEN], szSqlState[32] ;
|
|
SQLINTEGER nError = 0 ;
|
|
SQLSMALLINT nHandleType = HandleType ;
|
|
SQLSMALLINT nLength = 0 ;
|
|
SQLHANDLE SQLHandle = handle ;
|
|
SQLGetDiagRec(nHandleType, SQLHandle, 1, szSqlState, &nError, szError, 128, &nLength) ;
|
|
printf("Error: %s\nSqlState: %s\n", szError, szSqlState) ;
|
|
|
|
return ;
|
|
}
|
|
|
|
|
|
|
|
/*************************************************
|
|
Function: ReportError
|
|
*************************************************/
|
|
|
|
void ReportError(char* szFn, char* szBuffer, char* szFile, int iLine){
|
|
|
|
printf("%s %s\nFile: %s\nLine: %d\n", szFn, szBuffer, szFile, iLine) ;
|
|
|
|
return ;
|
|
}
|
|
|
|
|
|
|
|
/*************************************************
|
|
Function: GetHandles()
|
|
*************************************************/
|
|
|
|
SQLRETURN GetHandles(ODBC_HANDLES* pHandles, handle_op op, bool bDriverInfo){
|
|
|
|
SQLRETURN retcode = SQL_ERROR ;
|
|
|
|
if(GET == op){
|
|
|
|
retcode = SQLAllocHandle(SQL_HANDLE_ENV, SQL_NULL_HANDLE, &pHandles->henv);
|
|
|
|
if (SQL_SUCCESS == retcode || SQL_SUCCESS_WITH_INFO == retcode ) {
|
|
retcode = SQLSetEnvAttr(pHandles->henv, SQL_ATTR_ODBC_VERSION, (void*)SQL_OV_ODBC2, 0);
|
|
|
|
if (SQL_SUCCESS == retcode || SQL_SUCCESS_WITH_INFO == retcode) {
|
|
retcode = SQLAllocHandle(SQL_HANDLE_DBC, pHandles->henv, &pHandles->hdbc);
|
|
|
|
if (SQL_SUCCESS == retcode || SQL_SUCCESS_WITH_INFO == retcode) {
|
|
|
|
//SQLSetConnectAttr(pHandles->hdbc, SQL_LOGIN_TIMEOUT, (void*)5, 0);
|
|
|
|
retcode = SQLConnect(pHandles->hdbc, (SQLCHAR*)"", SQL_NTS, (SQLCHAR*)"", SQL_NTS, (SQLCHAR*)"", SQL_NTS ) ;
|
|
|
|
SQL_SUCCESS == SQLSetConnectAttr(pHandles->hdbc, SQL_ATTR_AUTOCOMMIT, (void*)SQL_AUTOCOMMIT_ON, 0) ;
|
|
//printf("AUTOCOMMIT is on\n") ;
|
|
|
|
if (SQL_SUCCESS == retcode || SQL_SUCCESS_WITH_INFO == retcode) {
|
|
// retcode still holds the value returned by SQLConnect
|
|
retcode = SQLAllocHandle(SQL_HANDLE_STMT, pHandles->hdbc, &pHandles->hstmt) ;
|
|
if (SQL_SUCCESS == retcode || SQL_SUCCESS_WITH_INFO == retcode) {
|
|
if(bDriverInfo) GetDriverAndSourceInfo(pHandles->hdbc) ;
|
|
// printf("All handles allocated OK\n", retcode);
|
|
}else{ // SQLAllocHandle()
|
|
REPORTERROR((char*)"SQLAllocHandle()", (char*)"failed") ;
|
|
HandleError(pHandles->hdbc, SQL_HANDLE_DBC) ;
|
|
ODBC_FN(SQLDisconnect(pHandles->hdbc), retcode) ;
|
|
ODBC_FN(SQLFreeHandle(SQL_HANDLE_DBC, pHandles->hdbc), retcode) ;
|
|
ODBC_FN(SQLFreeHandle(SQL_HANDLE_ENV, pHandles->henv), retcode) ;
|
|
retcode = SQL_ERROR ;
|
|
}
|
|
}else{ // SQLConnect()
|
|
REPORTERROR((char*)"SQLConnect()", (char*)"failed" ) ;
|
|
HandleError(pHandles->hdbc, SQL_HANDLE_DBC) ;
|
|
ODBC_FN(SQLFreeHandle(SQL_HANDLE_DBC, pHandles->hdbc), retcode) ;
|
|
ODBC_FN(SQLFreeHandle(SQL_HANDLE_ENV, pHandles->henv), retcode) ;
|
|
retcode = SQL_ERROR ;
|
|
}
|
|
}else{ // SQLAllocHandle()
|
|
REPORTERROR((char*)"SQLAllocHandle()", "failed" ) ;
|
|
HandleError(pHandles->hdbc, SQL_HANDLE_DBC) ;
|
|
ODBC_FN(SQLFreeHandle(SQL_HANDLE_ENV, pHandles->henv), retcode) ;
|
|
retcode = SQL_ERROR ;
|
|
}
|
|
}else{ // SQLSetEnvAttr()
|
|
REPORTERROR((char*)"SQLSetEnvAttr()", "failed" ) ;
|
|
HandleError(pHandles->henv, SQL_HANDLE_ENV) ;
|
|
ODBC_FN(SQLFreeHandle(SQL_HANDLE_ENV, pHandles->henv), retcode) ;
|
|
retcode = SQL_ERROR ;
|
|
}
|
|
}else{ // SQLAllocHandle()
|
|
REPORTERROR((char*)"SQLAllocHandle()", "failed" ) ;
|
|
HandleError(pHandles->henv, SQL_HANDLE_ENV) ;
|
|
retcode = SQL_ERROR ;
|
|
}
|
|
}else{
|
|
ODBC_FN(SQLFreeHandle(SQL_HANDLE_STMT, pHandles->hstmt), retcode) ;
|
|
ODBC_FN(SQLDisconnect(pHandles->hdbc), retcode) ;
|
|
ODBC_FN(SQLFreeHandle(SQL_HANDLE_DBC, pHandles->hdbc), retcode) ;
|
|
ODBC_FN(SQLFreeHandle(SQL_HANDLE_ENV, pHandles->henv), retcode) ;
|
|
}
|
|
|
|
return retcode ;
|
|
}
|
|
|
|
|
|
|
|
/*************************************************
|
|
Function: AggretateFn():
|
|
<aggr_fn fn> - name of the aggregate function to use
|
|
<char* szTableName> - name of the table
|
|
<int nCol> - number of the column
|
|
<double* pdIn> - pointer to double containing the value to be used in a call to COUNT; used only by this function
|
|
<double* pdOut> - pointer to double that will recieve the result
|
|
<attr_type attrType> - type of the attribute
|
|
*************************************************/
|
|
SQLRETURN AggregateFn(aggr_fn fn, char* szTableName, int nCol, double* pdIn, double* pdOut, attr_type attrType){
|
|
|
|
SQLRETURN retcode = SQL_ERROR ;
|
|
SQLCHAR* szStmt[MAX_SQL_STMT] = { 0 } ;
|
|
SQLCHAR szValueBuffer[MAX_VALUE_LEN] = { 0 } ;
|
|
SQLCHAR szAuxBuffer[MAX_STR_LEN] = { 0 } ;
|
|
SQLCHAR szColBuffer[MAX_COL_NAME] = { 0 } ;
|
|
ODBC_HANDLES stHandles ;
|
|
memset(&stHandles, 0, sizeof(ODBC_HANDLES)) ;
|
|
SQLINTEGER cbDouble = 0 ;
|
|
|
|
GetHandles(&stHandles, GET, 0) ;
|
|
|
|
switch(fn){
|
|
case FN_COUNT:
|
|
switch(attrType){
|
|
case T_INT:
|
|
sprintf((char*)szStmt, "SELECT COUNT(*) FROM %s WHERE COL%d > %d", szTableName, nCol, (int)*pdIn) ;
|
|
break ;
|
|
case T_FLOAT:
|
|
sprintf((char*)szStmt, "SELECT COUNT(*) FROM %s WHERE COL%d > %f", szTableName, nCol, (float)*pdIn) ;
|
|
break ;
|
|
/* case T_DOUBLE:
|
|
sprintf((char*)szStmt, "SELECT COUNT(*) FROM %s WHERE COL%d > %.15f", szTableName, nCol, *pdIn) ;
|
|
break ;
|
|
*/
|
|
default:
|
|
break ;
|
|
}
|
|
break ;
|
|
case FN_SUM:
|
|
sprintf((char*)szStmt, "SELECT SUM(COL%d) FROM %s", nCol, szTableName) ;
|
|
break ;
|
|
case FN_AVG:
|
|
sprintf((char*)szStmt, "SELECT AVG(COL%d) FROM %s", nCol, szTableName) ;
|
|
break ;
|
|
case FN_MAX:
|
|
sprintf((char*)szStmt, "SELECT MAX(COL%d) FROM %s", nCol, szTableName) ;
|
|
break ;
|
|
case FN_MIN:
|
|
sprintf((char*)szStmt, "SELECT MIN(COL%d) FROM %s", nCol, szTableName) ;
|
|
break ;
|
|
case FN_VARIANCE: // not implemented
|
|
//sprintf((char*)szStmt, "SELECT VARIANCE(COL%d) FROM %s;", nCol, szTableName) ;
|
|
break ;
|
|
case FN_STDDEV: // not implemented
|
|
//sprintf((char*)szStmt, "SELECT STDDEV(COL%d) FROM %s;", nCol, szTableName) ;
|
|
break ;
|
|
default:
|
|
break ;
|
|
}
|
|
//printf("%s\n", szStmt) ;
|
|
|
|
retcode = SQLExecDirect(stHandles.hstmt, (SQLCHAR*)szStmt, SQL_NTS) ;
|
|
if (SQL_SUCCESS == retcode || SQL_SUCCESS_WITH_INFO == retcode ){
|
|
retcode = SQLBindCol(stHandles.hstmt, 1, SQL_C_DOUBLE, (void*)pdOut, sizeof(SQLDOUBLE), &cbDouble) ;
|
|
if (SQL_SUCCESS == retcode || SQL_SUCCESS_WITH_INFO == retcode ){
|
|
retcode = SQLFetch(stHandles.hstmt) ;
|
|
}
|
|
}
|
|
|
|
if(SQL_SUCCESS != retcode && SQL_SUCCESS_WITH_INFO != retcode){
|
|
HandleError(stHandles.hstmt, SQL_HANDLE_STMT) ;
|
|
}
|
|
|
|
SQLCloseCursor(stHandles.hstmt) ;
|
|
|
|
GetHandles(&stHandles, FREE, 0) ;
|
|
|
|
return retcode ;
|
|
|
|
};
|
|
|
|
|
|
|
|
/*************************************************
|
|
Function: GetDriverAndSourceInfo()
|
|
*************************************************/
|
|
SQLRETURN GetDriverAndSourceInfo(SQLHDBC hdbc){
|
|
|
|
SQLRETURN retcode = SQL_ERROR ;
|
|
|
|
SQLCHAR buffer[255] ;
|
|
SQLUSMALLINT snValue = 0 ;
|
|
SQLSMALLINT outlen = 0 ;
|
|
|
|
printf( "-------------------------------------------\n" ) ;
|
|
|
|
retcode = SQLGetInfo( hdbc, SQL_DATA_SOURCE_NAME, buffer, 255, &outlen ) ;
|
|
|
|
printf( "Connected to Server: %s\n", buffer ) ;
|
|
|
|
retcode = SQLGetInfo( hdbc, SQL_DATABASE_NAME, buffer, 255, &outlen ) ;
|
|
printf( " Database name: %s\n", buffer ) ;
|
|
|
|
retcode = SQLGetInfo( hdbc, SQL_SERVER_NAME, buffer, 255, &outlen ) ;
|
|
printf( " Instance name: %s\n", buffer ) ;
|
|
|
|
retcode = SQLGetInfo( hdbc, SQL_DBMS_NAME, buffer, 255, &outlen ) ;
|
|
printf( " DBMS name: %s\n", buffer ) ;
|
|
|
|
retcode = SQLGetInfo( hdbc, SQL_DBMS_VER, buffer, 255, &outlen ) ;
|
|
printf( " DBMS version: %s\n", buffer ) ;
|
|
|
|
retcode = SQLGetInfo( hdbc, SQL_ODBC_VER, buffer, 255, &outlen ) ;
|
|
printf( " ODBC version: %s\n", buffer ) ;
|
|
|
|
retcode = SQLGetInfo( hdbc, SQL_DRIVER_NAME, buffer, 255, &outlen ) ;
|
|
printf( " Driver name: %s\n", buffer ) ;
|
|
|
|
retcode = SQLGetInfo( hdbc, SQL_DRIVER_VER, buffer, 255, &outlen ) ;
|
|
printf( " Driver version: %s\n", buffer ) ;
|
|
|
|
retcode = SQLGetInfo( hdbc, SQL_MAX_DRIVER_CONNECTIONS, &snValue, sizeof(SQLSMALLINT), &outlen ) ;
|
|
printf( " Max connections: %d\n", snValue ) ;
|
|
|
|
retcode = SQLGetInfo( hdbc, SQL_CURSOR_COMMIT_BEHAVIOR, &snValue, sizeof(SQLSMALLINT), &outlen ) ;
|
|
printf( "Autocommit behavior:") ;
|
|
|
|
switch(snValue){
|
|
case SQL_CB_DELETE:
|
|
printf(" SQL_CB_DELETE\n") ;
|
|
break ;
|
|
case SQL_CB_CLOSE:
|
|
printf(" SQL_CB_CLOSE\n") ;
|
|
break ;
|
|
case SQL_CB_PRESERVE:
|
|
printf(" SQL_CB_PRESERVE\n") ;
|
|
break ;
|
|
default:
|
|
printf(" undefined\n") ;
|
|
break ;
|
|
}
|
|
|
|
printf( "-------------------------------------------\n" ) ;
|
|
|
|
return retcode ;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************
|
|
Function: ArithOp()
|
|
*************************************************/
|
|
|
|
int ArithOp(char* szTable, int nTotalCols, float* pValue, attr_type attrType, arth_op op){
|
|
|
|
SQLRETURN retcode = SQL_ERROR ;
|
|
int nVerRet = -1 ;
|
|
SQLCHAR szStmt[MAX_SQL_STMT] = { 0 } ;
|
|
SQLCHAR szEndBuffer[MAX_STR_LEN] = { 0 } ;
|
|
SQLCHAR szColBuffer[MAX_COL_NAME] = { 0 } ;
|
|
SQLCHAR szAuxBuffer[MAX_STR_LEN] = { 0 } ;
|
|
ODBC_HANDLES stHandles ;
|
|
memset(&stHandles, 0, sizeof(ODBC_HANDLES)) ;
|
|
|
|
void* pBuffer = NULL ;
|
|
SQLINTEGER BindInt = 0, IntResult = 0, RefIntResult = 0 ;
|
|
SQLFLOAT BindFloat = 0, FloatResult = 0, RefFloatResult = 0 ;
|
|
SQLDOUBLE BindDouble = 0, DoubleResult = 0, RefDoubleResult = 0 ;
|
|
SQLINTEGER cbSize = 0 ;
|
|
SQLINTEGER cbLen = 0 ;
|
|
SQLSMALLINT cbTarget = 0 ;
|
|
|
|
GetHandles(&stHandles, GET, 0) ;
|
|
|
|
for(int c = 0 ; c < nTotalCols ; ++c){
|
|
|
|
sprintf((char*)szStmt, "SELECT COL%d, (COL%d", c, c) ;
|
|
switch(op){
|
|
case MINUS:
|
|
strcat((char*)szStmt, " - ") ;
|
|
break ;
|
|
case PLUS:
|
|
strcat((char*)szStmt, " + ") ;
|
|
break ;
|
|
case MULTI:
|
|
strcat((char*)szStmt, " * ") ;
|
|
break ;
|
|
case DIVIDE:
|
|
strcat((char*)szStmt, " / ") ;
|
|
break ;
|
|
case MODULO:
|
|
//strcat((char*)szStmt, " % ") ; Not implemented
|
|
GetHandles(&stHandles, FREE, 0) ;
|
|
return -1 ; //Close handles and return
|
|
break ;
|
|
default:
|
|
break ;
|
|
}
|
|
|
|
sprintf((char*)(szAuxBuffer),"%.9f) ", *((float*)(pValue))) ;
|
|
strcat((char*)szStmt, (char*)szAuxBuffer) ;
|
|
sprintf((char*)szEndBuffer, "FROM %s", szTable) ;
|
|
strcat((char*)szStmt, (char*)szEndBuffer) ;
|
|
|
|
ODBC_FN(SQLExecDirect(stHandles.hstmt, (SQLCHAR*)szStmt, SQL_NTS), retcode) ;
|
|
if(retcode == SQL_ERROR){
|
|
HandleError(stHandles.hstmt, SQL_HANDLE_STMT) ;
|
|
printf("\n%s\n", szStmt) ;
|
|
}
|
|
|
|
SQLSMALLINT cbNameLen = 0, cbSqlType = 0, cbNullable = 0, cbColScale = 0 ;
|
|
SQLINTEGER cbColSize = 0 ;
|
|
SQLDescribeCol(stHandles.hstmt, 2, szColBuffer, MAX_COL_NAME-1, &cbNameLen, &cbSqlType, (unsigned long*)&cbColSize, &cbColScale, &cbNullable) ;
|
|
|
|
switch(cbSqlType){
|
|
case SQL_NUMERIC:
|
|
pBuffer = &IntResult ;
|
|
cbSize = sizeof(SQLINTEGER) ;
|
|
cbTarget = SQL_C_ULONG ;
|
|
case SQL_INTEGER:
|
|
pBuffer = &IntResult ;
|
|
cbSize = sizeof(SQLINTEGER) ;
|
|
cbTarget = SQL_C_LONG ;
|
|
break ;
|
|
case SQL_FLOAT:
|
|
pBuffer = &FloatResult ;
|
|
cbSize = sizeof(SQLFLOAT) ;
|
|
cbTarget = SQL_C_FLOAT ;
|
|
break ;
|
|
case SQL_DOUBLE:
|
|
pBuffer = &DoubleResult ;
|
|
cbSize = sizeof(SQLDOUBLE) ;
|
|
cbTarget = SQL_C_DOUBLE ;
|
|
break ;
|
|
default:
|
|
printf("\nUndefined result type: %d\n", cbSqlType) ;
|
|
break ;
|
|
}
|
|
|
|
switch(attrType){
|
|
case T_INT:
|
|
ODBC_FN(SQLBindCol(stHandles.hstmt, 1, SQL_C_SLONG, (void*)&BindInt, sizeof(SQLINTEGER), &cbLen), retcode) ;
|
|
break ;
|
|
case T_FLOAT:
|
|
ODBC_FN(SQLBindCol(stHandles.hstmt, 1, SQL_C_FLOAT, (void*)&BindFloat, sizeof(SQLFLOAT), &cbLen), retcode) ;
|
|
break ;
|
|
/* case T_DOUBLE:
|
|
ODBC_FN(SQLBindCol(stHandles.hstmt, 1, SQL_C_DOUBLE, (void*)&BindDouble, sizeof(SQLDOUBLE), &cbLen), retcode) ;
|
|
break ;
|
|
*/
|
|
default:
|
|
break ;
|
|
}
|
|
|
|
ODBC_FN(SQLBindCol(stHandles.hstmt, 2, cbTarget, pBuffer, cbSize, &cbLen), retcode) ;
|
|
|
|
retcode = SQLFetch(stHandles.hstmt) ;
|
|
|
|
if (SQL_SUCCESS == retcode || SQL_SUCCESS_WITH_INFO == retcode){
|
|
switch(attrType){
|
|
case T_INT:
|
|
switch(cbSqlType){
|
|
case SQL_INTEGER:
|
|
nVerRet = VerifyArthOp((int*)&BindInt, pValue, (int*)pBuffer, op) ;
|
|
break ;
|
|
case SQL_FLOAT:
|
|
nVerRet = VerifyArthOp((int*)&BindInt, pValue, (float*)pBuffer, op) ;
|
|
break ;
|
|
case SQL_DOUBLE:
|
|
nVerRet = VerifyArthOp((int*)&BindInt, pValue, (double*)pBuffer, op) ;
|
|
break ;
|
|
case SQL_NUMERIC:
|
|
nVerRet = VerifyArthOp((int*)&BindInt, pValue, (int*)pBuffer, op) ;
|
|
break ;
|
|
default:
|
|
break ;
|
|
}
|
|
break ;
|
|
|
|
case T_FLOAT:
|
|
switch(cbSqlType){
|
|
case SQL_INTEGER:
|
|
nVerRet = VerifyArthOp((float*)&BindFloat, pValue, (int*)pBuffer, op) ;
|
|
break ;
|
|
case SQL_FLOAT:
|
|
nVerRet = VerifyArthOp((float*)&BindFloat, pValue, (float*)pBuffer, op) ;
|
|
break ;
|
|
case SQL_DOUBLE:
|
|
nVerRet = VerifyArthOp((float*)&BindFloat, pValue, (double*)pBuffer, op) ;
|
|
break ;
|
|
default:
|
|
break ;
|
|
}
|
|
break ;
|
|
/* case T_DOUBLE:
|
|
switch(cbSqlType){
|
|
case SQL_INTEGER:
|
|
nVerRet = VerifyArthOp((double*)&BindDouble, pValue, (int*)pBuffer, op) ;
|
|
break ;
|
|
case SQL_FLOAT:
|
|
nVerRet = VerifyArthOp((double*)&BindDouble, pValue, (float*)pBuffer, op) ;
|
|
break ;
|
|
case SQL_DOUBLE:
|
|
nVerRet = VerifyArthOp((double*)&BindDouble, pValue, (double*)pBuffer, op) ;
|
|
break ;
|
|
default:
|
|
break ;
|
|
}
|
|
break ;
|
|
*/
|
|
default:
|
|
break ;
|
|
}
|
|
if(-1 == nVerRet){
|
|
printf("\nVerification failed.\n") ;
|
|
return nVerRet ;
|
|
}else if(SQL_NO_DATA == retcode){
|
|
break ;
|
|
}
|
|
}else{
|
|
|
|
HandleError(stHandles.hstmt, SQL_HANDLE_STMT) ;
|
|
}
|
|
|
|
SQLCloseCursor(stHandles.hstmt) ;
|
|
}
|
|
|
|
GetHandles(&stHandles, FREE, 0) ;
|
|
|
|
return nVerRet ;
|
|
}
|
|
|
|
|
|
|
|
|
|
/*************************************************
|
|
Function: Join()
|
|
*************************************************/
|
|
SQLRETURN Join(char* szTable, int nTables, int nCol, join_type joinType){
|
|
|
|
SQLRETURN retcode = SQL_ERROR ;
|
|
SQLCHAR szStmt[MAX_SQL_STMT] = { 0 } ;
|
|
SQLCHAR szEndBuffer[MAX_STR_LEN] = { 0 } ;
|
|
SQLCHAR szColBuffer[MAX_COL_NAME] = { 0 } ;
|
|
SQLCHAR szAuxBuffer[MAX_STR_LEN] = { 0 } ;
|
|
|
|
ODBC_HANDLES stHandles ;
|
|
memset(&stHandles, 0, sizeof(ODBC_HANDLES)) ;
|
|
|
|
int c = 0, t = 0 ;
|
|
|
|
GetHandles(&stHandles, GET, 0) ;
|
|
|
|
for(c = 0 ; c < nCol ; ++c) {
|
|
|
|
switch(joinType){
|
|
case ITSELF:
|
|
sprintf((char*)szStmt, "SELECT * FROM %s, %s", (char*)szTable, (char*)szTable) ;
|
|
break ;
|
|
case EQUI:
|
|
break ;
|
|
case NON_EQUI:
|
|
break ;
|
|
case INNER:
|
|
break ;
|
|
case OUTTER:
|
|
break ;
|
|
default:
|
|
break ;
|
|
}
|
|
}
|
|
|
|
GetHandles(&stHandles, FREE, 0) ;
|
|
|
|
return retcode ;
|
|
|
|
}
|
|
|
|
|
|
|
|
SQLRETURN GetResults(SQLHSTMT){
|
|
|
|
SQLRETURN retcode = SQL_ERROR ;
|
|
|
|
return retcode ;
|
|
}
|
|
|
|
/*
|
|
|
|
int createTables(char* szTableName, int nTables){
|
|
|
|
for (int i = 0; i < nNoOfCol; i++){
|
|
snprintf(attrName[i], MAXSTRLEN, "COL%d", i) ;
|
|
}
|
|
|
|
for (int i = 0; i < nTables; i++){
|
|
snprintf(tableName[i], MAXSTRLEN, "TAB%d", i) ;
|
|
}
|
|
|
|
for(unsigned i = 0; i < nTables; i++){
|
|
|
|
ndbout << "Creating " << szTableName[i] << "... " ;
|
|
|
|
NDBT_Table tmpTable(szTableName[i]) ;
|
|
|
|
tmpTable.setStoredTable(!theTempTable) ;
|
|
|
|
tmpTable.addAttribute(NDBT_Attribute(attrName[0],
|
|
UnSigned,
|
|
4, // 4 Bytes
|
|
TupleKey));
|
|
}
|
|
|
|
|
|
for (int j = 1 ; j < nNoOfCol ; j++)
|
|
tmpTable.addAttribute(NDBT_Attribute(attrName[j], UnSigned, 4*tAttributeSize)) ;
|
|
|
|
if(tmpTable.createTableInDb(pMyNdb) == -1){
|
|
return -1 ;
|
|
}
|
|
|
|
ndbout << "done" << endl ;
|
|
|
|
return 0;
|
|
}
|
|
*/
|
|
|
|
/*************************************************
|
|
Function: createTables()
|
|
Uses NDB API to create tables for the tests
|
|
*************************************************/
|
|
|
|
int createTables(char* szTableName, int nTables){
|
|
|
|
Ndb * pNdb = new Ndb("TEST_DB") ;
|
|
pNdb->init();
|
|
|
|
ndbout << "Waiting for ndb to become ready..." <<endl;
|
|
if (pNdb->waitUntilReady(10000) != 0){
|
|
ndbout << "NDB is not ready" << endl;
|
|
ndbout << "Benchmark failed!" << endl;
|
|
delete pNdb ;
|
|
return -1 ;
|
|
}
|
|
|
|
NdbSchemaCon *MySchemaTransaction = NULL ;
|
|
NdbSchemaOp *MySchemaOp = NULL ;
|
|
int check = -1 ;
|
|
char szColNameBuffer[MAX_COL_NAME] = { 0 } ;
|
|
int tLoadFactor = 80 ;
|
|
|
|
for(int i=0 ; i < nTables ; ++i) {
|
|
|
|
ndbout << "Creating " << (char*)(szTableName+MAX_TABLE_NAME*i) << "..." << endl ;
|
|
|
|
MySchemaTransaction = pNdb->startSchemaTransaction() ;
|
|
//printf("MySchemaTransaction - OK\n") ;
|
|
if(MySchemaTransaction == NULL){
|
|
printf("MySchemaTransaction is NULL\n") ;
|
|
delete pNdb ;
|
|
return -1 ;
|
|
}
|
|
|
|
MySchemaOp = MySchemaTransaction->getNdbSchemaOp();
|
|
//printf("MySchemaTransaction->getNdb... - OK\n") ;
|
|
if(MySchemaOp == NULL){
|
|
printf("MySchemaOp is NULL\n") ;
|
|
delete pNdb ;
|
|
return -1 ;
|
|
}
|
|
|
|
check = MySchemaOp->createTable( (const char*)(szTableName+MAX_TABLE_NAME*i)
|
|
,8 // Table Size
|
|
,TupleKey // Key Type
|
|
,40 // Nr of Pages
|
|
,All
|
|
,6
|
|
,(tLoadFactor - 5)
|
|
,(tLoadFactor)
|
|
,1
|
|
,0
|
|
);
|
|
|
|
if (check == -1){
|
|
printf("MySchemaOp->createTable failed\n") ;
|
|
delete pNdb ;
|
|
return -1 ;
|
|
}
|
|
|
|
snprintf(szColNameBuffer, MAX_COL_NAME, "COL%d", 0) ;
|
|
check = MySchemaOp->createAttribute( szColNameBuffer,
|
|
TupleKey,
|
|
32,
|
|
PKSIZE,
|
|
UnSigned,
|
|
MMBased,
|
|
NotNullAttribute );
|
|
|
|
if (check == -1){
|
|
printf("MySchemaOp->createAttribute() #1 failed\n") ;
|
|
delete pNdb ;
|
|
return -1 ;
|
|
}
|
|
|
|
for (int j = 1; j < nNoOfCol ; j++){
|
|
snprintf(szColNameBuffer, MAX_COL_NAME, "COL%d", j) ;
|
|
check = MySchemaOp->createAttribute(szColNameBuffer,
|
|
NoKey,
|
|
32,
|
|
tAttributeSize,
|
|
UnSigned,
|
|
MMBased,
|
|
NotNullAttribute );
|
|
|
|
if (check == -1){
|
|
printf("MySchemaOp->createAttribute() #2 failed\n") ;
|
|
delete pNdb ;
|
|
return -1;
|
|
}
|
|
}
|
|
|
|
if (MySchemaTransaction->execute() == -1){
|
|
printf("MySchemaTransaction->execute() failed\n") ;
|
|
printf("%s\n", MySchemaTransaction->getNdbError().message) ;
|
|
return -1 ;
|
|
delete pNdb ;
|
|
}
|
|
|
|
pNdb->closeSchemaTransaction(MySchemaTransaction);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
|
|
|