mirror of
https://github.com/MariaDB/server.git
synced 2025-01-22 06:44:16 +01:00
4dabfa5de7
into mysql.com:/home/kent/bk/main/mysql-5.1 BUILD/Makefile.am: Auto merged BitKeeper/deleted/.del-ArrayFifoList.hpp~7036ae04dd7e7bd2: Auto merged BitKeeper/deleted/.del-ArrayList.hpp~44695d09b1a02179: Auto merged BitKeeper/deleted/.del-DbtupLCP.cpp~855b1ed3fbc86a42: Auto merged BitKeeper/deleted/.del-DbtupSystemRestart.cpp~15b54d7e4e75d2d: Auto merged BitKeeper/deleted/.del-DbtupUndoLog.cpp~5a2ef6e86b1404e9: Auto merged Makefile.am: Auto merged BitKeeper/deleted/.del-Makefile.am~2: Auto merged BitKeeper/deleted/.del-Makefile.am~ab5c84d46412dc2e: Auto merged BitKeeper/deleted/.del-Makefile.am~abb265028eb9b6a7: Auto merged BitKeeper/deleted/.del-Makefile.am~de166d6fcac3b9b6: Auto merged BitKeeper/deleted/.del-Makefile.am~e5b911533dad2713: Auto merged BitKeeper/deleted/.del-Makefile.am~ead19441cc5ff35c: Auto merged BitKeeper/deleted/.del-Makefile.am~f87185e232d7c4f: Auto merged BitKeeper/deleted/.del-Makefile.in: Auto merged BitKeeper/deleted/.del-MemoryChannelOSE.hpp: Auto merged BitKeeper/deleted/.del-MetaData.cpp~146ae9865dd35829: Auto merged BitKeeper/deleted/.del-MetaData.hpp~538342afcd8ac53c: Auto merged BitKeeper/deleted/.del-NdbCondition.c~ad83464328ab37af: Auto merged BitKeeper/deleted/.del-NdbCondition.c~ee56562abdd718cf: Auto merged BitKeeper/deleted/.del-NdbConditionOSE.h~455dd2c29c2e6344: Auto merged BitKeeper/deleted/.del-NdbDaemon.c~3b8101f376b28df: Auto merged BitKeeper/deleted/.del-NdbEnv.c~207f9ce9754c9e8a: Auto merged BitKeeper/deleted/.del-NdbEnv.c~bb6fe7572d45288a: Auto merged BitKeeper/deleted/.del-NdbErrHnd.cpp: Auto merged BitKeeper/deleted/.del-NdbHost.c~2c29816c77396d7b: Auto merged BitKeeper/deleted/.del-NdbHost.c~cf18d6b3c825180c: Auto merged BitKeeper/deleted/.del-NdbMem.c~6285b159985d46da: Auto merged BitKeeper/deleted/.del-NdbMem.c~6c2b317c1ce230ab: Auto merged BitKeeper/deleted/.del-NdbMem_SoftOse.cpp~9c61e311ec168d44: Auto merged BitKeeper/deleted/.del-NdbMutex.c~768131269bccca10: Auto merged BitKeeper/deleted/.del-NdbMutex.c~f4bdd19be08b84ab: Auto merged BitKeeper/deleted/.del-NdbOut.cpp~8caa99a0d729540c: Auto merged BitKeeper/deleted/.del-NdbSleep.c~b643ea3e7103eb62: Auto merged BitKeeper/deleted/.del-NdbSleep.c~b88fbc5b140de10d: Auto merged BitKeeper/deleted/.del-NdbTCP.c~1e9f416992352f6d: Auto merged BitKeeper/deleted/.del-NdbTCP.c~b09cdcbef3ea2c57: Auto merged BitKeeper/deleted/.del-NdbThread.c~2fe1fa5f47801772: Auto merged BitKeeper/deleted/.del-NdbThread.c~fe71a67b5c3a4724: Auto merged BitKeeper/deleted/.del-NdbTick.c~aa6385567216509d: Auto merged BitKeeper/deleted/.del-NdbTick.c~b76feba2cf1493d1: Auto merged BitKeeper/deleted/.del-OSE_Receiver.cpp: Auto merged BitKeeper/deleted/.del-OSE_Receiver.hpp: Auto merged BitKeeper/deleted/.del-OSE_Signals.hpp: Auto merged BitKeeper/deleted/.del-OSE_Transporter.cpp: Auto merged BitKeeper/deleted/.del-OSE_Transporter.hpp: Auto merged BitKeeper/deleted/.del-TraceNdbApi.hpp~7a7f0ae5b70358bc: Auto merged BitKeeper/deleted/.del-VerifyNdbApi.hpp~f417f78f7cd05935: Auto merged BitKeeper/deleted/.del-bcd.h~81fbfcc1530534da: Auto merged BitKeeper/deleted/.del-config-os2.h~a16b51851ddd317b: Auto merged BitKeeper/deleted/.del-dbGenerator.c~7509c19f70cad0bf: Auto merged BitKeeper/deleted/.del-dbGenerator.h~63f1aeb98260bcb7: Auto merged BitKeeper/deleted/.del-dbGenerator.h~e1aaa6725999d458: Auto merged BitKeeper/deleted/.del-dbPopulate.c~5dcff1c99783d83b: Auto merged BitKeeper/deleted/.del-dbPopulate.h~229a894b59d4da73: Auto merged BitKeeper/deleted/.del-ha_berkeley.cc: Auto merged BitKeeper/deleted/.del-ha_berkeley.h: Auto merged BitKeeper/deleted/.del-localDbPrepare.c~33a2c46afc8fac9a: Auto merged BitKeeper/deleted/.del-macros.h~58097d584e29b5df: Auto merged BitKeeper/deleted/.del-macros.h~742871fab0681964: Auto merged BitKeeper/deleted/.del-mainGenerator.c~2d1c8016f72b2517: Auto merged BitKeeper/deleted/.del-mainPopulate.c~37def9a44980b8ec: Auto merged BitKeeper/deleted/.del-mgmapi_logevent.cpp~f1e7cf3e70edc4: Auto merged BitKeeper/deleted/.del-mmslist.cpp: Auto merged BitKeeper/deleted/.del-my_lread.c: Auto merged BitKeeper/deleted/.del-my_lwrite.c: Auto merged BitKeeper/deleted/.del-my_os2cond.c~e3b520af1c371bb5: Auto merged BitKeeper/deleted/.del-my_os2dirsrch.c~4e2479b2abb2eb5a: Auto merged BitKeeper/deleted/.del-my_os2dirsrch.h~5011cbc657537d0: Auto merged BitKeeper/deleted/.del-my_os2dlfcn.c~6d94b488717683dd: Auto merged BitKeeper/deleted/.del-my_os2dlfcn.h0~eae8edb8555eff87: Auto merged BitKeeper/deleted/.del-my_os2file64.c~251fb8a1e950c31b: Auto merged BitKeeper/deleted/.del-my_os2thread.c~65dca991548cec2a: Auto merged BitKeeper/deleted/.del-my_os2tls.c~58ade7a0f70ad5ea: Auto merged BitKeeper/deleted/.del-mysqlmanager-pwgen.c~d8f5f91ec54432b9: Auto merged BitKeeper/deleted/.del-mysqlmanager.c~e97636d71145a0b: Auto merged BitKeeper/deleted/.del-mysqlmanagerc.c~4f6e3499e68508f6: Auto merged BitKeeper/deleted/.del-ndb_error.hpp~24468bb7f20a0b41: Auto merged BitKeeper/deleted/.del-ndb_error.hpp~45a2fef922beae3: Auto merged BitKeeper/deleted/.del-ndb_schema.hpp~de9c21185d6bfe4e: Auto merged BitKeeper/deleted/.del-ndbapi_async.cpp~319189569fb659ec: Auto merged BitKeeper/deleted/.del-ndbapi_async1.cpp~2995dac9b963a0d: Auto merged BitKeeper/deleted/.del-ndbapi_event.cpp~c5d949802966180: Auto merged BitKeeper/deleted/.del-ndbapi_retries.cpp~7301496d8c1c310a: Auto merged BitKeeper/deleted/.del-ndbapi_scan.cpp~14ed2aa9a5d9e597: Auto merged BitKeeper/deleted/.del-ndbapi_simple.cpp~80962179f3c2f5b8: Auto merged BitKeeper/deleted/.del-ndbapi_simple_index.cpp~4b95a4d71808b5b6: Auto merged BitKeeper/deleted/.del-print-limit-table~b8e808031daa3758: Auto merged BitKeeper/deleted/.del-raid.cc~488f5fa6538394e1: Auto merged BitKeeper/deleted/.del-raid.h~2d2503a66b128ac6: Auto merged BitKeeper/deleted/.del-raid2.c~fe7aea5fb4b9748c: Auto merged BitKeeper/deleted/.del-sql_manager.h: Auto merged BitKeeper/deleted/.del-testData.h~696038ea2623a90b: Auto merged BitKeeper/deleted/.del-testData.h~898b71d7c639319e: Auto merged BitKeeper/deleted/.del-testDefinitions.h~f18a4553579a3725: Auto merged BitKeeper/deleted/.del-userHandle.h~3275bb415e1ca2c2: Auto merged BitKeeper/deleted/.del-userHandle.h~ec22dc7a7ed2f81b: Auto merged BitKeeper/deleted/.del-userInterface.cpp~82ee612ab14b3d48: Auto merged BitKeeper/deleted/.del-userInterface.c~92a20032f7d1e91: Auto merged BitKeeper/deleted/.del-userInterface.h~1f76ad2f28b283fd: Auto merged BitKeeper/deleted/.del-userInterface.h~49139f029bbdaabc: Auto merged BitKeeper/deleted/.del-userTransaction.c~438012ecc761b776: Auto merged BitKeeper/deleted/.del-userTransaction.c~f50661b4f54b0bdd: Auto merged BitKeeper/deleted/.del-utv.h~f64af026b9705ebb: Auto merged BitKeeper/deleted/.del-vcdrfunc.h~85803875180684cd: Auto merged BitKeeper/deleted/.del-waiter.cpp~b188e4bfddf2cf98: Auto merged Docs/Makefile.am: Auto merged client/Makefile.am: Auto merged client/client_priv.h: Auto merged client/get_password.c: Auto merged client/mysql.cc: Auto merged client/mysql_upgrade.c: Auto merged client/mysqladmin.cc: Auto merged client/mysqlbinlog.cc: Auto merged client/mysqlcheck.c: Auto merged client/mysqldump.c: Auto merged client/mysqlimport.c: Auto merged client/mysqlshow.c: Auto merged client/mysqltest.c: Auto merged dbug/Makefile.am: Auto merged extra/Makefile.am: Auto merged extra/comp_err.c: Auto merged extra/perror.c: Auto merged extra/replace.c: Auto merged extra/resolveip.c: Auto merged include/Makefile.am: Auto merged include/base64.h: Auto merged include/config-netware.h: Auto merged include/config-win.h: Auto merged include/decimal.h: Auto merged include/errmsg.h: Auto merged include/ft_global.h: Auto merged include/heap.h: Auto merged include/m_ctype.h: Auto merged include/m_string.h: Auto merged include/my_base.h: Auto merged include/my_bitmap.h: Auto merged include/my_dbug.h: Auto merged include/my_global.h: Auto merged include/my_net.h: Auto merged include/my_no_pthread.h: Auto merged include/my_nosys.h: Auto merged include/my_pthread.h: Auto merged include/my_sys.h: Auto merged include/my_time.h: Auto merged include/my_tree.h: Auto merged include/my_xml.h: Auto merged include/myisam.h: Auto merged include/myisammrg.h: Auto merged include/mysql.h: Auto merged include/mysql_com.h: Auto merged include/mysys_err.h: Auto merged include/queues.h: Auto merged include/thr_alarm.h: Auto merged include/thr_lock.h: Auto merged include/violite.h: Auto merged libmysqld/Makefile.am: Auto merged libmysqld/emb_qcache.cc: Auto merged libmysqld/embedded_priv.h: Auto merged libmysqld/examples/Makefile.am: Auto merged libmysqld/libmysqld.c: Auto merged mysql-test/Makefile.am: Auto merged mysys/Makefile.am: Auto merged mysys/array.c: Auto merged mysys/base64.c: Auto merged mysys/charset-def.c: Auto merged mysys/default.c: Auto merged mysys/default_modify.c: Auto merged mysys/errors.c: Auto merged mysys/hash.c: Auto merged mysys/mf_dirname.c: Auto merged mysys/mf_format.c: Auto merged mysys/mf_iocache.c: Auto merged mysys/mf_iocache2.c: Auto merged mysys/mf_keycache.c: Auto merged mysys/mf_pack.c: Auto merged mysys/mf_path.c: Auto merged mysys/mf_tempdir.c: Auto merged mysys/mf_tempfile.c: Auto merged mysys/my_access.c: Auto merged mysys/my_alloc.c: Auto merged mysys/my_append.c: Auto merged mysys/my_bit.c: Auto merged mysys/my_bitmap.c: Auto merged mysys/my_clock.c: Auto merged mysys/my_compress.c: Auto merged mysys/my_copy.c: Auto merged mysys/my_create.c: Auto merged mysys/my_dup.c: Auto merged mysys/my_error.c: Auto merged mysys/my_file.c: Auto merged mysys/my_gethostbyname.c: Auto merged mysys/my_getopt.c: Auto merged mysys/my_getwd.c: Auto merged mysys/my_handler.c: Auto merged mysys/my_init.c: Auto merged mysys/my_lib.c: Auto merged mysys/my_lock.c: Auto merged mysys/my_malloc.c: Auto merged mysys/my_mkdir.c: Auto merged mysys/my_mmap.c: Auto merged mysys/my_net.c: Auto merged mysys/my_once.c: Auto merged mysys/my_open.c: Auto merged mysys/my_pread.c: Auto merged mysys/my_pthread.c: Auto merged mysys/my_redel.c: Auto merged mysys/my_rename.c: Auto merged mysys/my_seek.c: Auto merged mysys/my_sleep.c: Auto merged mysys/my_static.c: Auto merged mysys/my_symlink2.c: Auto merged mysys/my_thr_init.c: Auto merged mysys/mysys_priv.h: Auto merged mysys/ptr_cmp.c: Auto merged mysys/queues.c: Auto merged mysys/safemalloc.c: Auto merged mysys/string.c: Auto merged mysys/test_dir.c: Auto merged mysys/testhash.c: Auto merged mysys/thr_alarm.c: Auto merged mysys/thr_lock.c: Auto merged mysys/thr_mutex.c: Auto merged regex/Makefile.am: Auto merged scripts/Makefile.am: Auto merged server-tools/instance-manager/Makefile.am: Auto merged server-tools/instance-manager/buffer.cc: Auto merged server-tools/instance-manager/command.cc: Auto merged server-tools/instance-manager/command.h: Auto merged server-tools/instance-manager/commands.cc: Auto merged server-tools/instance-manager/commands.h: Auto merged server-tools/instance-manager/guardian.cc: Auto merged server-tools/instance-manager/guardian.h: Auto merged server-tools/instance-manager/instance.cc: Auto merged server-tools/instance-manager/instance.h: Auto merged server-tools/instance-manager/instance_map.cc: Auto merged server-tools/instance-manager/instance_map.h: Auto merged server-tools/instance-manager/instance_options.cc: Auto merged server-tools/instance-manager/instance_options.h: Auto merged server-tools/instance-manager/listener.cc: Auto merged server-tools/instance-manager/listener.h: Auto merged server-tools/instance-manager/log.cc: Auto merged server-tools/instance-manager/log.h: Auto merged server-tools/instance-manager/manager.cc: Auto merged server-tools/instance-manager/manager.h: Auto merged server-tools/instance-manager/messages.cc: Auto merged server-tools/instance-manager/mysql_connection.cc: Auto merged server-tools/instance-manager/mysql_connection.h: Auto merged server-tools/instance-manager/mysql_manager_error.h: Auto merged server-tools/instance-manager/mysqlmanager.cc: Auto merged server-tools/instance-manager/options.cc: Auto merged server-tools/instance-manager/options.h: Auto merged server-tools/instance-manager/parse.cc: Auto merged server-tools/instance-manager/parse.h: Auto merged server-tools/instance-manager/parse_output.cc: Auto merged server-tools/instance-manager/parse_output.h: Auto merged server-tools/instance-manager/priv.cc: Auto merged server-tools/instance-manager/priv.h: Auto merged server-tools/instance-manager/protocol.cc: Auto merged server-tools/instance-manager/protocol.h: Auto merged server-tools/instance-manager/thread_registry.cc: Auto merged server-tools/instance-manager/thread_registry.h: Auto merged server-tools/instance-manager/user_map.cc: Auto merged server-tools/instance-manager/user_map.h: Auto merged sql/Makefile.am: Auto merged sql/discover.cc: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged sql/field_conv.cc: Auto merged sql/filesort.cc: Auto merged sql/gen_lex_hash.cc: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/ha_ndbcluster.h: Auto merged sql/handler.cc: Auto merged sql/handler.h: Auto merged sql/hostname.cc: Auto merged sql/init.cc: Auto merged sql/item.cc: Auto merged sql/item.h: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_cmpfunc.h: Auto merged sql/item_create.cc: Auto merged sql/item_create.h: Auto merged sql/item_func.cc: Auto merged sql/item_func.h: Auto merged sql/item_geofunc.cc: Auto merged sql/item_geofunc.h: Auto merged sql/item_row.cc: Auto merged sql/item_row.h: Auto merged sql/item_strfunc.cc: Auto merged sql/item_strfunc.h: Auto merged sql/item_subselect.cc: Auto merged sql/item_subselect.h: Auto merged sql/item_sum.cc: Auto merged sql/item_sum.h: Auto merged sql/item_timefunc.cc: Auto merged sql/item_timefunc.h: Auto merged sql/item_uniq.cc: Auto merged sql/key.cc: Auto merged sql/lex.h: Auto merged sql/lex_symbol.h: Auto merged sql/lock.cc: Auto merged sql/log.cc: Auto merged sql/log_event.cc: Auto merged sql/log_event.h: Auto merged sql/my_decimal.cc: Auto merged sql/my_decimal.h: Auto merged sql/my_lock.c: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/net_serv.cc: Auto merged sql/opt_range.cc: Auto merged sql/opt_range.h: Auto merged sql/opt_sum.cc: Auto merged sql/parse_file.cc: Auto merged sql/parse_file.h: Auto merged sql/password.c: Auto merged sql/procedure.h: Auto merged sql/protocol.cc: Auto merged sql/protocol.h: Auto merged sql/records.cc: Auto merged sql/repl_failsafe.cc: Auto merged sql/set_var.cc: Auto merged sql/set_var.h: Auto merged sql/slave.cc: Auto merged sql/slave.h: Auto merged sql/sp.cc: Auto merged sql/sp.h: Auto merged sql/sp_cache.cc: Auto merged sql/sp_head.cc: Auto merged sql/sp_head.h: Auto merged sql/spatial.cc: Auto merged sql/spatial.h: Auto merged sql/sql_acl.cc: Auto merged sql/sql_acl.h: Auto merged sql/sql_analyse.cc: Auto merged sql/sql_analyse.h: Auto merged sql/sql_base.cc: Auto merged sql/sql_bitmap.h: Auto merged sql/sql_cache.cc: Auto merged sql/sql_cache.h: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_crypt.cc: Auto merged sql/sql_cursor.cc: Auto merged sql/sql_db.cc: Auto merged sql/sql_delete.cc: Auto merged sql/sql_derived.cc: Auto merged sql/sql_do.cc: Auto merged sql/sql_error.cc: Auto merged sql/sql_error.h: Auto merged sql/sql_handler.cc: Auto merged sql/sql_help.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_list.h: Auto merged sql/sql_load.cc: Auto merged sql/sql_manager.cc: Auto merged sql/sql_map.cc: Auto merged sql/sql_olap.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_prepare.cc: Auto merged sql/sql_rename.cc: Auto merged sql/sql_repl.cc: Auto merged sql/sql_repl.h: Auto merged sql/sql_select.cc: Auto merged sql/sql_select.h: Auto merged sql/sql_show.cc: Auto merged sql/sql_string.cc: Auto merged sql/sql_string.h: Auto merged sql/sql_table.cc: Auto merged sql/sql_test.cc: Auto merged sql/sql_trigger.cc: Auto merged sql/sql_trigger.h: Auto merged sql/sql_udf.cc: Auto merged sql/sql_union.cc: Auto merged sql/sql_update.cc: Auto merged sql/sql_view.cc: Auto merged sql-bench/Makefile.am: Auto merged sql-bench/as3ap.sh: Auto merged sql-bench/bench-count-distinct.sh: Auto merged sql-bench/bench-init.pl.sh: Auto merged sql-bench/compare-results.sh: Auto merged sql-bench/copy-db.sh: Auto merged sql/share/charsets/Index.xml: Auto merged sql/share/charsets/cp1250.xml: Auto merged sql/sql_view.h: Auto merged sql/sql_yacc.yy: Auto merged sql/stacktrace.c: Auto merged sql/stacktrace.h: Auto merged sql/strfunc.cc: Auto merged sql/structs.h: Auto merged sql/table.cc: Auto merged sql/table.h: Auto merged sql/time.cc: Auto merged sql/tztime.cc: Auto merged sql/tztime.h: Auto merged sql/udf_example.c: Auto merged sql/unireg.cc: Auto merged sql/unireg.h: Auto merged sql-bench/crash-me.sh: Auto merged sql-bench/run-all-tests.sh: Auto merged sql-bench/server-cfg.sh: Auto merged sql-bench/test-ATIS.sh: Auto merged sql-bench/test-alter-table.sh: Auto merged sql-bench/test-big-tables.sh: Auto merged sql-bench/test-connect.sh: Auto merged sql-bench/test-create.sh: Auto merged sql-bench/test-insert.sh: Auto merged sql-bench/test-select.sh: Auto merged sql-bench/test-transactions.sh: Auto merged sql-bench/test-wisconsin.sh: Auto merged sql-common/client.c: Auto merged sql-common/my_time.c: Auto merged storage/archive/ha_archive.cc: Auto merged storage/archive/ha_archive.h: Auto merged storage/blackhole/ha_blackhole.cc: Auto merged storage/blackhole/ha_blackhole.h: Auto merged storage/csv/ha_tina.cc: Auto merged storage/csv/ha_tina.h: Auto merged storage/example/ha_example.cc: Auto merged storage/example/ha_example.h: Auto merged storage/federated/ha_federated.cc: Auto merged storage/federated/ha_federated.h: Auto merged storage/heap/Makefile.am: Auto merged storage/heap/_check.c: Auto merged storage/heap/_rectest.c: Auto merged storage/heap/ha_heap.cc: Auto merged storage/heap/ha_heap.h: Auto merged storage/heap/heapdef.h: Auto merged storage/heap/hp_block.c: Auto merged storage/heap/hp_clear.c: Auto merged storage/heap/hp_close.c: Auto merged storage/heap/hp_create.c: Auto merged storage/heap/hp_delete.c: Auto merged storage/heap/hp_extra.c: Auto merged storage/heap/hp_hash.c: Auto merged storage/heap/hp_info.c: Auto merged storage/heap/hp_open.c: Auto merged storage/heap/hp_panic.c: Auto merged storage/heap/hp_rename.c: Auto merged storage/heap/hp_rfirst.c: Auto merged storage/heap/hp_rkey.c: Auto merged storage/heap/hp_rlast.c: Auto merged storage/heap/hp_rnext.c: Auto merged storage/heap/hp_rprev.c: Auto merged storage/heap/hp_rrnd.c: Auto merged storage/heap/hp_rsame.c: Auto merged storage/heap/hp_scan.c: Auto merged storage/heap/hp_static.c: Auto merged storage/heap/hp_test1.c: Auto merged storage/heap/hp_test2.c: Auto merged storage/heap/hp_update.c: Auto merged storage/heap/hp_write.c: Auto merged storage/innobase/Makefile.am: Auto merged storage/innobase/btr/Makefile.am: Auto merged storage/innobase/buf/Makefile.am: Auto merged storage/innobase/data/Makefile.am: Auto merged storage/innobase/dict/Makefile.am: Auto merged storage/innobase/dyn/Makefile.am: Auto merged storage/innobase/eval/Makefile.am: Auto merged storage/innobase/fil/Makefile.am: Auto merged storage/innobase/fsp/Makefile.am: Auto merged storage/innobase/fut/Makefile.am: Auto merged storage/innobase/ha/Makefile.am: Auto merged storage/innobase/handler/ha_innodb.cc: Auto merged storage/innobase/handler/ha_innodb.h: Auto merged storage/innobase/ibuf/Makefile.am: Auto merged storage/innobase/lock/Makefile.am: Auto merged storage/innobase/log/Makefile.am: Auto merged storage/innobase/mach/Makefile.am: Auto merged storage/innobase/mem/Makefile.am: Auto merged storage/innobase/mtr/Makefile.am: Auto merged storage/innobase/os/Makefile.am: Auto merged storage/innobase/page/Makefile.am: Auto merged storage/innobase/pars/Makefile.am: Auto merged storage/innobase/que/Makefile.am: Auto merged storage/innobase/read/Makefile.am: Auto merged storage/innobase/rem/Makefile.am: Auto merged storage/innobase/row/Makefile.am: Auto merged storage/innobase/srv/Makefile.am: Auto merged storage/innobase/sync/Makefile.am: Auto merged storage/innobase/thr/Makefile.am: Auto merged storage/innobase/trx/Makefile.am: Auto merged storage/innobase/usr/Makefile.am: Auto merged storage/innobase/ut/Makefile.am: Auto merged storage/myisam/Makefile.am: Auto merged storage/myisam/ft_boolean_search.c: Auto merged storage/myisam/ft_eval.c: Auto merged storage/myisam/ft_eval.h: Auto merged storage/myisam/ft_nlq_search.c: Auto merged storage/myisam/ft_parser.c: Auto merged storage/myisam/ft_static.c: Auto merged storage/myisam/ft_stem.c: Auto merged storage/myisam/ft_stopwords.c: Auto merged storage/myisam/ft_test1.c: Auto merged storage/myisam/ft_test1.h: Auto merged storage/myisam/ft_update.c: Auto merged storage/myisam/ftdefs.h: Auto merged storage/myisam/fulltext.h: Auto merged storage/myisam/ha_myisam.cc: Auto merged storage/myisam/ha_myisam.h: Auto merged storage/myisam/mi_cache.c: Auto merged storage/myisam/mi_changed.c: Auto merged storage/myisam/mi_check.c: Auto merged storage/myisam/mi_checksum.c: Auto merged storage/myisam/mi_close.c: Auto merged storage/myisam/mi_create.c: Auto merged storage/myisam/mi_dbug.c: Auto merged storage/myisam/mi_delete.c: Auto merged storage/myisam/mi_delete_all.c: Auto merged storage/myisam/mi_delete_table.c: Auto merged storage/myisam/mi_dynrec.c: Auto merged storage/myisam/mi_extra.c: Auto merged storage/myisam/mi_info.c: Auto merged storage/myisam/mi_key.c: Auto merged storage/myisam/mi_keycache.c: Auto merged storage/myisam/mi_locking.c: Auto merged storage/myisam/mi_log.c: Auto merged storage/myisam/mi_open.c: Auto merged storage/myisam/mi_packrec.c: Auto merged storage/myisam/mi_page.c: Auto merged storage/myisam/mi_panic.c: Auto merged storage/myisam/mi_preload.c: Auto merged storage/myisam/mi_range.c: Auto merged storage/myisam/mi_rename.c: Auto merged storage/myisam/mi_rfirst.c: Auto merged storage/myisam/mi_rkey.c: Auto merged storage/myisam/mi_rlast.c: Auto merged storage/myisam/mi_rnext.c: Auto merged storage/myisam/mi_rnext_same.c: Auto merged storage/myisam/mi_rprev.c: Auto merged storage/myisam/mi_rrnd.c: Auto merged storage/myisam/mi_rsame.c: Auto merged storage/myisam/mi_rsamepos.c: Auto merged storage/myisam/mi_scan.c: Auto merged storage/myisam/mi_search.c: Auto merged storage/myisam/mi_static.c: Auto merged storage/myisam/mi_statrec.c: Auto merged storage/myisam/mi_test1.c: Auto merged storage/myisam/mi_test2.c: Auto merged storage/myisam/mi_test3.c: Auto merged storage/myisam/mi_unique.c: Auto merged storage/myisam/mi_update.c: Auto merged storage/myisam/mi_write.c: Auto merged storage/myisam/myisam_ftdump.c: Auto merged storage/myisam/myisamchk.c: Auto merged storage/myisam/myisamdef.h: Auto merged storage/myisam/myisamlog.c: Auto merged storage/myisam/myisampack.c: Auto merged storage/myisam/rt_index.c: Auto merged storage/myisam/rt_index.h: Auto merged storage/myisam/rt_key.c: Auto merged storage/myisam/rt_key.h: Auto merged storage/myisam/rt_mbr.c: Auto merged storage/myisam/rt_mbr.h: Auto merged storage/myisam/rt_split.c: Auto merged storage/myisam/rt_test.c: Auto merged storage/myisam/sort.c: Auto merged storage/myisam/sp_defs.h: Auto merged storage/myisam/sp_key.c: Auto merged storage/myisam/sp_test.c: Auto merged storage/myisammrg/Makefile.am: Auto merged storage/myisammrg/ha_myisammrg.cc: Auto merged storage/myisammrg/ha_myisammrg.h: Auto merged storage/myisammrg/myrg_close.c: Auto merged storage/myisammrg/myrg_create.c: Auto merged storage/myisammrg/myrg_def.h: Auto merged storage/myisammrg/myrg_delete.c: Auto merged storage/myisammrg/myrg_extra.c: Auto merged storage/myisammrg/myrg_info.c: Auto merged storage/myisammrg/myrg_locking.c: Auto merged storage/myisammrg/myrg_open.c: Auto merged storage/myisammrg/myrg_panic.c: Auto merged storage/myisammrg/myrg_queue.c: Auto merged storage/myisammrg/myrg_range.c: Auto merged storage/myisammrg/myrg_rfirst.c: Auto merged storage/myisammrg/myrg_rkey.c: Auto merged storage/myisammrg/myrg_rlast.c: Auto merged storage/myisammrg/myrg_rnext.c: Auto merged storage/myisammrg/myrg_rnext_same.c: Auto merged storage/myisammrg/myrg_rprev.c: Auto merged storage/myisammrg/myrg_rrnd.c: Auto merged storage/myisammrg/myrg_rsame.c: Auto merged storage/myisammrg/myrg_static.c: Auto merged storage/myisammrg/myrg_update.c: Auto merged storage/myisammrg/myrg_write.c: Auto merged storage/ndb/include/debugger/DebuggerNames.hpp: Auto merged storage/ndb/include/debugger/EventLogger.hpp: Auto merged storage/ndb/include/debugger/GrepError.hpp: Auto merged storage/ndb/include/debugger/SignalLoggerManager.hpp: Auto merged storage/ndb/include/ndb_constants.h: Auto merged storage/ndb/include/ndb_global.h.in: Auto merged storage/ndb/include/ndb_init.h: Auto merged storage/ndb/include/ndb_types.h.in: Auto merged storage/ndb/include/ndb_version.h.in: Auto merged storage/ndb/include/editline/editline.h: Auto merged storage/ndb/include/kernel/AttributeDescriptor.hpp: Auto merged storage/ndb/include/kernel/AttributeHeader.hpp: Auto merged storage/ndb/include/kernel/AttributeList.hpp: Auto merged storage/ndb/include/kernel/BlockNumbers.h: Auto merged storage/ndb/include/kernel/GlobalSignalNumbers.h: Auto merged storage/ndb/include/kernel/GrepEvent.hpp: Auto merged storage/ndb/include/kernel/Interpreter.hpp: Auto merged storage/ndb/include/kernel/LogLevel.hpp: Auto merged storage/ndb/include/kernel/NodeBitmask.hpp: Auto merged storage/ndb/include/kernel/NodeInfo.hpp: Auto merged storage/ndb/include/kernel/NodeState.hpp: Auto merged storage/ndb/include/kernel/RefConvert.hpp: Auto merged storage/ndb/include/kernel/kernel_types.h: Auto merged storage/ndb/include/kernel/ndb_limits.h: Auto merged storage/ndb/include/kernel/signaldata/AbortAll.hpp: Auto merged storage/ndb/include/kernel/signaldata/AccFrag.hpp: Auto merged storage/ndb/include/kernel/signaldata/AccLock.hpp: Auto merged storage/ndb/include/kernel/signaldata/AccScan.hpp: Auto merged storage/ndb/include/kernel/signaldata/AccSizeAltReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/AlterIndx.hpp: Auto merged storage/ndb/include/kernel/signaldata/AlterTab.hpp: Auto merged storage/ndb/include/kernel/signaldata/AlterTable.hpp: Auto merged storage/ndb/include/kernel/signaldata/AlterTrig.hpp: Auto merged storage/ndb/include/kernel/signaldata/ApiBroadcast.hpp: Auto merged storage/ndb/include/kernel/signaldata/ApiRegSignalData.hpp: Auto merged storage/ndb/include/kernel/signaldata/ApiVersion.hpp: Auto merged storage/ndb/include/kernel/signaldata/ArbitSignalData.hpp: Auto merged storage/ndb/include/kernel/signaldata/AttrInfo.hpp: Auto merged storage/ndb/include/kernel/signaldata/BackupContinueB.hpp: Auto merged storage/ndb/include/kernel/signaldata/BackupImpl.hpp: Auto merged storage/ndb/include/kernel/signaldata/BackupSignalData.hpp: Auto merged storage/ndb/include/kernel/signaldata/BlockCommitOrd.hpp: Auto merged storage/ndb/include/kernel/signaldata/BuildIndx.hpp: Auto merged storage/ndb/include/kernel/signaldata/CheckNodeGroups.hpp: Auto merged storage/ndb/include/kernel/signaldata/CloseComReqConf.hpp: Auto merged storage/ndb/include/kernel/signaldata/CmInit.hpp: Auto merged storage/ndb/include/kernel/trigger_definitions.h: Auto merged storage/ndb/include/kernel/signaldata/CmRegSignalData.hpp: Auto merged storage/ndb/include/kernel/signaldata/CmvmiCfgConf.hpp: Auto merged storage/ndb/include/kernel/signaldata/CntrMasterConf.hpp: Auto merged storage/ndb/include/kernel/signaldata/CntrMasterReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/ConfigParamId.hpp: Auto merged storage/ndb/include/kernel/signaldata/ContinueFragmented.hpp: Auto merged storage/ndb/include/kernel/signaldata/CopyActive.hpp: Auto merged storage/ndb/include/kernel/signaldata/CopyFrag.hpp: Auto merged storage/ndb/include/kernel/signaldata/CopyGCIReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/CreateEvnt.hpp: Auto merged storage/ndb/include/kernel/signaldata/CreateFrag.hpp: Auto merged storage/ndb/include/kernel/signaldata/CreateFragmentation.hpp: Auto merged storage/ndb/include/kernel/signaldata/CreateIndx.hpp: Auto merged storage/ndb/include/kernel/signaldata/CreateTab.hpp: Auto merged storage/ndb/include/kernel/signaldata/CreateTable.hpp: Auto merged storage/ndb/include/kernel/signaldata/CreateTrig.hpp: Auto merged storage/ndb/include/kernel/signaldata/DiAddTab.hpp: Auto merged storage/ndb/include/kernel/signaldata/DiGetNodes.hpp: Auto merged storage/ndb/include/kernel/signaldata/DictLock.hpp: Auto merged storage/ndb/include/kernel/signaldata/DictSchemaInfo.hpp: Auto merged storage/ndb/include/kernel/signaldata/DictSizeAltReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/DictStart.hpp: Auto merged storage/ndb/include/kernel/signaldata/DictTabInfo.hpp: Auto merged storage/ndb/include/kernel/signaldata/DihAddFrag.hpp: Auto merged storage/ndb/include/kernel/signaldata/DihContinueB.hpp: Auto merged storage/ndb/include/kernel/signaldata/DihSizeAltReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/DihStartTab.hpp: Auto merged storage/ndb/include/kernel/signaldata/DihSwitchReplica.hpp: Auto merged storage/ndb/include/kernel/signaldata/DisconnectRep.hpp: Auto merged storage/ndb/include/kernel/signaldata/DropIndx.hpp: Auto merged storage/ndb/include/kernel/signaldata/DropTab.hpp: Auto merged storage/ndb/include/kernel/signaldata/DropTabFile.hpp: Auto merged storage/ndb/include/kernel/signaldata/DropTable.hpp: Auto merged storage/ndb/include/kernel/signaldata/DropTrig.hpp: Auto merged storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp: Auto merged storage/ndb/include/kernel/signaldata/EmptyLcp.hpp: Auto merged storage/ndb/include/kernel/signaldata/EndTo.hpp: Auto merged storage/ndb/include/kernel/signaldata/EventReport.hpp: Auto merged storage/ndb/include/kernel/signaldata/EventSubscribeReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/ExecFragReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/FailRep.hpp: Auto merged storage/ndb/include/kernel/signaldata/FireTrigOrd.hpp: Auto merged storage/ndb/include/kernel/signaldata/FsAppendReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/FsCloseReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/FsConf.hpp: Auto merged storage/ndb/include/kernel/signaldata/FsOpenReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/FsReadWriteReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/FsRef.hpp: Auto merged storage/ndb/include/kernel/signaldata/FsRemoveReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/GCPSave.hpp: Auto merged storage/ndb/include/kernel/signaldata/GetTabInfo.hpp: Auto merged storage/ndb/include/kernel/signaldata/GetTableId.hpp: Auto merged storage/ndb/include/kernel/signaldata/GrepImpl.hpp: Auto merged storage/ndb/include/kernel/signaldata/HotSpareRep.hpp: Auto merged storage/ndb/include/kernel/signaldata/IndxAttrInfo.hpp: Auto merged storage/ndb/include/kernel/signaldata/IndxKeyInfo.hpp: Auto merged storage/ndb/include/kernel/signaldata/InvalidateNodeLCPConf.hpp: Auto merged storage/ndb/include/kernel/signaldata/InvalidateNodeLCPReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/KeyInfo.hpp: Auto merged storage/ndb/include/kernel/signaldata/LCP.hpp: Auto merged storage/ndb/include/kernel/signaldata/ListTables.hpp: Auto merged storage/ndb/include/kernel/signaldata/LqhFrag.hpp: Auto merged storage/ndb/include/kernel/signaldata/LqhKey.hpp: Auto merged storage/ndb/include/kernel/signaldata/LqhSizeAltReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/LqhTransConf.hpp: Auto merged storage/ndb/include/kernel/signaldata/ManagementServer.hpp: Auto merged storage/ndb/include/kernel/signaldata/MasterGCP.hpp: Auto merged storage/ndb/include/kernel/signaldata/MasterLCP.hpp: Auto merged storage/ndb/include/kernel/signaldata/NFCompleteRep.hpp: Auto merged storage/ndb/include/kernel/signaldata/NdbSttor.hpp: Auto merged storage/ndb/include/kernel/signaldata/NdbfsContinueB.hpp: Auto merged storage/ndb/include/kernel/signaldata/NextScan.hpp: Auto merged storage/ndb/include/kernel/signaldata/NodeFailRep.hpp: Auto merged storage/ndb/include/kernel/signaldata/NodeStateSignalData.hpp: Auto merged storage/ndb/include/kernel/signaldata/PackedSignal.hpp: Auto merged storage/ndb/include/kernel/signaldata/PrepDropTab.hpp: Auto merged storage/ndb/include/kernel/signaldata/PrepFailReqRef.hpp: Auto merged storage/ndb/include/kernel/signaldata/ReadNodesConf.hpp: Auto merged storage/ndb/include/kernel/signaldata/RelTabMem.hpp: Auto merged storage/ndb/include/kernel/signaldata/RepImpl.hpp: Auto merged storage/ndb/include/kernel/signaldata/ResumeReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/ScanFrag.hpp: Auto merged storage/ndb/include/kernel/signaldata/ScanTab.hpp: Auto merged storage/ndb/include/kernel/signaldata/SetLogLevelOrd.hpp: Auto merged storage/ndb/include/kernel/signaldata/SetVarReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/SignalData.hpp: Auto merged storage/ndb/include/kernel/signaldata/SignalDataPrint.hpp: Auto merged storage/ndb/include/kernel/signaldata/SignalDroppedRep.hpp: Auto merged storage/ndb/include/kernel/signaldata/SrFragidConf.hpp: Auto merged storage/ndb/include/kernel/signaldata/StartFragReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/StartInfo.hpp: Auto merged storage/ndb/include/kernel/signaldata/StartMe.hpp: Auto merged storage/ndb/include/kernel/signaldata/StartOrd.hpp: Auto merged storage/ndb/include/kernel/signaldata/StartPerm.hpp: Auto merged storage/ndb/include/kernel/signaldata/StartRec.hpp: Auto merged storage/ndb/include/kernel/signaldata/StartTo.hpp: Auto merged storage/ndb/include/kernel/signaldata/StopMe.hpp: Auto merged storage/ndb/include/kernel/signaldata/StopPerm.hpp: Auto merged storage/ndb/include/kernel/signaldata/StopReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/SumaImpl.hpp: Auto merged storage/ndb/include/kernel/signaldata/SystemError.hpp: Auto merged storage/ndb/include/kernel/signaldata/TamperOrd.hpp: Auto merged storage/ndb/include/kernel/signaldata/TcCommit.hpp: Auto merged storage/ndb/include/kernel/signaldata/TcContinueB.hpp: Auto merged storage/ndb/include/kernel/signaldata/TcHbRep.hpp: Auto merged storage/ndb/include/kernel/signaldata/TcIndx.hpp: Auto merged storage/ndb/include/kernel/signaldata/TcKeyConf.hpp: Auto merged storage/ndb/include/kernel/signaldata/TcKeyFailConf.hpp: Auto merged storage/ndb/include/kernel/signaldata/TcKeyRef.hpp: Auto merged storage/ndb/include/kernel/signaldata/TcKeyReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/TcRollbackRep.hpp: Auto merged storage/ndb/include/kernel/signaldata/TcSizeAltReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/TestOrd.hpp: Auto merged storage/ndb/include/kernel/signaldata/TransIdAI.hpp: Auto merged storage/ndb/include/kernel/signaldata/TrigAttrInfo.hpp: Auto merged storage/ndb/include/kernel/signaldata/TupCommit.hpp: Auto merged storage/ndb/include/kernel/signaldata/TupFrag.hpp: Auto merged storage/ndb/include/kernel/signaldata/TupKey.hpp: Auto merged storage/ndb/include/kernel/signaldata/TupSizeAltReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/TuxBound.hpp: Auto merged storage/ndb/include/kernel/signaldata/TuxContinueB.hpp: Auto merged storage/ndb/include/kernel/signaldata/TuxMaint.hpp: Auto merged storage/ndb/include/kernel/signaldata/TuxSizeAltReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/UpdateTo.hpp: Auto merged storage/ndb/include/kernel/signaldata/UtilDelete.hpp: Auto merged storage/ndb/include/kernel/signaldata/UtilExecute.hpp: Auto merged storage/ndb/include/kernel/signaldata/UtilLock.hpp: Auto merged storage/ndb/include/kernel/signaldata/UtilPrepare.hpp: Auto merged storage/ndb/include/kernel/signaldata/UtilRelease.hpp: Auto merged storage/ndb/include/kernel/signaldata/UtilSequence.hpp: Auto merged storage/ndb/include/kernel/signaldata/WaitGCP.hpp: Auto merged storage/ndb/include/logger/ConsoleLogHandler.hpp: Auto merged storage/ndb/include/logger/FileLogHandler.hpp: Auto merged storage/ndb/include/logger/LogHandler.hpp: Auto merged storage/ndb/include/logger/Logger.hpp: Auto merged storage/ndb/include/logger/SysLogHandler.hpp: Auto merged storage/ndb/include/mgmapi/mgmapi.h: Auto merged storage/ndb/include/mgmapi/mgmapi_debug.h: Auto merged storage/ndb/include/mgmapi/ndb_logevent.h: Auto merged storage/ndb/include/mgmapi/ndbd_exit_codes.h: Auto merged storage/ndb/include/mgmcommon/ConfigRetriever.hpp: Auto merged storage/ndb/include/mgmcommon/IPCConfig.hpp: Auto merged storage/ndb/include/mgmcommon/MgmtErrorReporter.hpp: Auto merged storage/ndb/include/ndbapi/Ndb.hpp: Auto merged storage/ndb/include/ndbapi/NdbApi.hpp: Auto merged storage/ndb/include/ndbapi/NdbBlob.hpp: Auto merged storage/ndb/include/ndbapi/NdbDictionary.hpp: Auto merged storage/ndb/include/ndbapi/NdbError.hpp: Auto merged storage/ndb/include/ndbapi/NdbEventOperation.hpp: Auto merged storage/ndb/include/ndbapi/NdbIndexOperation.hpp: Auto merged storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp: Auto merged storage/ndb/include/ndbapi/NdbOperation.hpp: Auto merged storage/ndb/include/ndbapi/NdbPool.hpp: Auto merged storage/ndb/include/ndbapi/NdbRecAttr.hpp: Auto merged storage/ndb/include/ndbapi/NdbReceiver.hpp: Auto merged storage/ndb/include/ndbapi/NdbScanFilter.hpp: Auto merged storage/ndb/include/ndbapi/NdbScanOperation.hpp: Auto merged storage/ndb/include/ndbapi/NdbTransaction.hpp: Auto merged storage/ndb/include/ndbapi/ndb_cluster_connection.hpp: Auto merged storage/ndb/include/ndbapi/ndb_opt_defaults.h: Auto merged storage/ndb/include/ndbapi/ndbapi_limits.h: Auto merged storage/ndb/include/ndbapi/ndberror.h: Auto merged storage/ndb/include/newtonapi/dba.h: Auto merged storage/ndb/include/newtonapi/defs/pcn_types.h: Auto merged storage/ndb/include/portlib/NdbCondition.h: Auto merged storage/ndb/include/portlib/NdbConfig.h: Auto merged storage/ndb/include/portlib/NdbDaemon.h: Auto merged storage/ndb/include/portlib/NdbEnv.h: Auto merged storage/ndb/include/portlib/NdbHost.h: Auto merged storage/ndb/include/portlib/NdbMain.h: Auto merged storage/ndb/include/portlib/NdbMem.h: Auto merged storage/ndb/include/portlib/NdbMutex.h: Auto merged storage/ndb/include/portlib/NdbSleep.h: Auto merged storage/ndb/include/portlib/NdbTCP.h: Auto merged storage/ndb/include/portlib/NdbThread.h: Auto merged storage/ndb/include/portlib/NdbTick.h: Auto merged storage/ndb/include/portlib/PortDefs.h: Auto merged storage/ndb/include/portlib/prefetch.h: Auto merged storage/ndb/include/transporter/TransporterCallback.hpp: Auto merged storage/ndb/include/transporter/TransporterDefinitions.hpp: Auto merged storage/ndb/include/transporter/TransporterRegistry.hpp: Auto merged storage/ndb/include/util/BaseString.hpp: Auto merged storage/ndb/include/util/Bitmask.hpp: Auto merged storage/ndb/include/util/File.hpp: Auto merged storage/ndb/include/util/InputStream.hpp: Auto merged storage/ndb/include/util/NdbAutoPtr.hpp: Auto merged storage/ndb/include/util/NdbOut.hpp: Auto merged storage/ndb/include/util/NdbSqlUtil.hpp: Auto merged storage/ndb/include/util/OutputStream.hpp: Auto merged storage/ndb/include/util/Parser.hpp: Auto merged storage/ndb/include/util/Properties.hpp: Auto merged storage/ndb/include/util/SimpleProperties.hpp: Auto merged storage/ndb/include/util/SocketAuthenticator.hpp: Auto merged storage/ndb/include/util/SocketClient.hpp: Auto merged storage/ndb/include/util/SocketServer.hpp: Auto merged storage/ndb/include/util/UtilBuffer.hpp: Auto merged storage/ndb/include/util/Vector.hpp: Auto merged storage/ndb/include/util/basestring_vsnprintf.h: Auto merged storage/ndb/include/util/md5_hash.hpp: Auto merged storage/ndb/include/util/ndb_opts.h: Auto merged storage/ndb/include/util/random.h: Auto merged storage/ndb/include/util/socket_io.h: Auto merged storage/ndb/include/util/uucode.h: Auto merged storage/ndb/include/util/version.h: Auto merged storage/ndb/src/common/debugger/BlockNames.cpp: Auto merged storage/ndb/src/common/debugger/DebuggerNames.cpp: Auto merged storage/ndb/src/common/debugger/EventLogger.cpp: Auto merged storage/ndb/src/common/debugger/GrepError.cpp: Auto merged storage/ndb/src/common/debugger/SignalLoggerManager.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/AccLock.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/AlterIndx.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/AlterTab.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/AlterTable.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/AlterTrig.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/BackupImpl.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/BackupSignalData.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/CloseComReqConf.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/ContinueB.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/CopyGCI.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/CreateEvnt.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/CreateFragmentation.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/CreateIndx.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/CreateTrig.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/DihContinueB.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/DihSwitchReplicaReq.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/DisconnectRep.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/DropIndx.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/DropTab.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/DropTrig.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/FailRep.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/FireTrigOrd.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/FsAppendReq.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/FsCloseReq.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/FsConf.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/FsOpenReq.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/FsReadWriteReq.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/FsRef.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/GCPSave.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/IndxAttrInfo.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/IndxKeyInfo.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/LCP.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/LqhFrag.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/LqhKey.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/LqhTrans.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/MasterLCP.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/NFCompleteRep.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/NdbSttor.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/NdbfsContinueB.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/PackedSignal.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/PrepDropTab.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/PrepFailReqRef.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/ScanFrag.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/ScanTab.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/SignalDataPrint.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/SignalDroppedRep.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/SignalNames.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/StartRec.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/SumaImpl.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/SystemError.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/TcIndx.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/TcKeyConf.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/TcKeyRef.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/TcKeyReq.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/TcRollbackRep.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/TrigAttrInfo.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/TupCommit.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/TupKey.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/TuxMaint.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/UtilDelete.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/UtilExecute.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/UtilLock.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/UtilPrepare.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/UtilSequence.cpp: Auto merged storage/ndb/src/common/logger/ConsoleLogHandler.cpp: Auto merged storage/ndb/src/common/logger/FileLogHandler.cpp: Auto merged storage/ndb/src/common/logger/LogHandler.cpp: Auto merged storage/ndb/src/common/logger/LogHandlerList.cpp: Auto merged storage/ndb/src/common/logger/LogHandlerList.hpp: Auto merged storage/ndb/src/common/logger/Logger.cpp: Auto merged storage/ndb/src/common/logger/SysLogHandler.cpp: Auto merged storage/ndb/src/common/logger/listtest/LogHandlerListUnitTest.cpp: Auto merged storage/ndb/src/common/logger/listtest/LogHandlerListUnitTest.hpp: Auto merged storage/ndb/src/common/logger/loggertest/LoggerUnitTest.cpp: Auto merged storage/ndb/src/common/logger/loggertest/LoggerUnitTest.hpp: Auto merged storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp: Auto merged storage/ndb/src/common/mgmcommon/IPCConfig.cpp: Auto merged storage/ndb/src/common/mgmcommon/printConfig/printConfig.cpp: Auto merged storage/ndb/src/common/portlib/NdbCondition.c: Auto merged storage/ndb/src/common/portlib/NdbConfig.c: Auto merged storage/ndb/src/common/portlib/NdbDaemon.c: Auto merged storage/ndb/src/common/portlib/NdbEnv.c: Auto merged storage/ndb/src/common/portlib/NdbHost.c: Auto merged storage/ndb/src/common/portlib/NdbMem.c: Auto merged storage/ndb/src/common/portlib/NdbMutex.c: Auto merged storage/ndb/src/common/portlib/NdbPortLibTest.cpp: Auto merged storage/ndb/src/common/portlib/NdbSleep.c: Auto merged storage/ndb/src/common/portlib/NdbTCP.cpp: Auto merged storage/ndb/src/common/portlib/NdbThread.c: Auto merged storage/ndb/src/common/portlib/NdbTick.c: Auto merged storage/ndb/src/common/portlib/memtest.c: Auto merged storage/ndb/src/common/portlib/mmstest.cpp: Auto merged storage/ndb/src/common/portlib/munmaptest.cpp: Auto merged storage/ndb/src/common/portlib/win32/NdbCondition.c: Auto merged storage/ndb/src/common/portlib/win32/NdbDaemon.c: Auto merged storage/ndb/src/common/portlib/win32/NdbEnv.c: Auto merged storage/ndb/src/common/portlib/win32/NdbHost.c: Auto merged storage/ndb/src/common/portlib/win32/NdbMem.c: Auto merged storage/ndb/src/common/portlib/win32/NdbMutex.c: Auto merged storage/ndb/src/common/portlib/win32/NdbSleep.c: Auto merged storage/ndb/src/common/portlib/win32/NdbTCP.c: Auto merged storage/ndb/src/common/portlib/win32/NdbThread.c: Auto merged storage/ndb/src/common/portlib/win32/NdbTick.c: Auto merged storage/ndb/src/common/transporter/Packer.cpp: Auto merged storage/ndb/src/common/transporter/Packer.hpp: Auto merged storage/ndb/src/common/transporter/SCI_Transporter.cpp: Auto merged storage/ndb/src/common/transporter/SCI_Transporter.hpp: Auto merged storage/ndb/src/common/transporter/SHM_Buffer.hpp: Auto merged storage/ndb/src/common/transporter/SHM_Transporter.cpp: Auto merged storage/ndb/src/common/transporter/SHM_Transporter.hpp: Auto merged storage/ndb/src/common/transporter/SHM_Transporter.unix.cpp: Auto merged storage/ndb/src/common/transporter/SHM_Transporter.win32.cpp: Auto merged storage/ndb/src/common/transporter/SendBuffer.cpp: Auto merged storage/ndb/src/common/transporter/SendBuffer.hpp: Auto merged storage/ndb/src/common/transporter/TCP_Transporter.cpp: Auto merged storage/ndb/src/common/transporter/TCP_Transporter.hpp: Auto merged storage/ndb/src/common/transporter/Transporter.cpp: Auto merged storage/ndb/src/common/transporter/Transporter.hpp: Auto merged storage/ndb/src/common/transporter/TransporterInternalDefinitions.hpp: Auto merged storage/ndb/src/common/transporter/TransporterRegistry.cpp: Auto merged storage/ndb/src/common/transporter/basictest/basicTransporterTest.cpp: Auto merged storage/ndb/src/common/transporter/buddy.cpp: Auto merged storage/ndb/src/common/transporter/buddy.hpp: Auto merged storage/ndb/src/common/transporter/failoverSCI/failoverSCI.cpp: Auto merged storage/ndb/src/common/transporter/perftest/perfTransporterTest.cpp: Auto merged storage/ndb/src/common/transporter/priotest/prioSCI/prioSCI.cpp: Auto merged storage/ndb/src/common/transporter/priotest/prioSHM/prioSHM.cpp: Auto merged storage/ndb/src/common/transporter/priotest/prioTCP/prioTCP.cpp: Auto merged storage/ndb/src/common/transporter/priotest/prioTransporterTest.cpp: Auto merged storage/ndb/src/common/transporter/priotest/prioTransporterTest.hpp: Auto merged storage/ndb/src/common/util/BaseString.cpp: Auto merged storage/ndb/src/common/util/File.cpp: Auto merged storage/ndb/src/common/util/InputStream.cpp: Auto merged storage/ndb/src/common/util/NdbOut.cpp: Auto merged storage/ndb/src/common/util/NdbSqlUtil.cpp: Auto merged storage/ndb/src/common/util/OutputStream.cpp: Auto merged storage/ndb/src/common/util/Parser.cpp: Auto merged storage/ndb/src/common/util/Properties.cpp: Auto merged storage/ndb/src/common/util/SimpleProperties.cpp: Auto merged storage/ndb/src/common/util/SocketAuthenticator.cpp: Auto merged storage/ndb/src/common/util/SocketClient.cpp: Auto merged storage/ndb/src/common/util/SocketServer.cpp: Auto merged storage/ndb/src/common/util/basestring_vsnprintf.c: Auto merged storage/ndb/src/common/util/md5_hash.cpp: Auto merged storage/ndb/src/common/util/ndb_init.c: Auto merged storage/ndb/src/common/util/random.c: Auto merged storage/ndb/src/common/util/socket_io.cpp: Auto merged storage/ndb/src/common/util/strdup.c: Auto merged storage/ndb/src/common/util/filetest/FileUnitTest.cpp: Auto merged storage/ndb/src/common/util/filetest/FileUnitTest.hpp: Auto merged storage/ndb/src/common/util/testProperties/testProperties.cpp: Auto merged storage/ndb/src/common/util/testSimpleProperties/sp_test.cpp: Auto merged storage/ndb/src/common/util/uucode.c: Auto merged storage/ndb/src/common/util/version.c: Auto merged storage/ndb/src/cw/cpcc-win32/C++/CPC_GUI.cpp: Auto merged storage/ndb/src/cw/cpcc-win32/C++/CPC_GUI.h: Auto merged storage/ndb/src/cw/cpcc-win32/C++/NdbControls.cpp: Auto merged storage/ndb/src/cw/cpcc-win32/C++/StdAfx.cpp: Auto merged storage/ndb/src/cw/cpcc-win32/C++/StdAfx.h: Auto merged storage/ndb/src/cw/cpcc-win32/C++/TreeView.cpp: Auto merged storage/ndb/src/cw/cpcc-win32/C++/TreeView.h: Auto merged storage/ndb/src/cw/cpcc-win32/C++/resource.h: Auto merged storage/ndb/src/cw/cpcd/APIService.cpp: Auto merged storage/ndb/src/cw/cpcd/APIService.hpp: Auto merged storage/ndb/src/cw/cpcd/CPCD.cpp: Auto merged storage/ndb/src/cw/cpcd/CPCD.hpp: Auto merged storage/ndb/src/cw/cpcd/Monitor.cpp: Auto merged storage/ndb/src/cw/cpcd/Process.cpp: Auto merged storage/ndb/src/cw/cpcd/common.cpp: Auto merged storage/ndb/src/cw/cpcd/common.hpp: Auto merged storage/ndb/src/cw/cpcd/main.cpp: Auto merged storage/ndb/src/cw/test/socketclient/socketClientTest.cpp: Auto merged storage/ndb/src/cw/util/ClientInterface.cpp: Auto merged storage/ndb/src/cw/util/ClientInterface.hpp: Auto merged storage/ndb/src/cw/util/SocketRegistry.cpp: Auto merged storage/ndb/src/cw/util/SocketRegistry.hpp: Auto merged storage/ndb/src/cw/util/SocketService.cpp: Auto merged storage/ndb/src/cw/util/SocketService.hpp: Auto merged storage/ndb/src/kernel/SimBlockList.cpp: Auto merged storage/ndb/src/kernel/blocks/mutexes.hpp: Auto merged storage/ndb/src/kernel/main.cpp: Auto merged storage/ndb/src/kernel/blocks/backup/Backup.cpp: Auto merged storage/ndb/src/kernel/blocks/backup/Backup.hpp: Auto merged storage/ndb/src/kernel/blocks/backup/BackupFormat.hpp: Auto merged storage/ndb/src/kernel/blocks/backup/BackupInit.cpp: Auto merged storage/ndb/src/kernel/blocks/backup/FsBuffer.hpp: Auto merged storage/ndb/src/kernel/blocks/backup/read.cpp: Auto merged storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp: Auto merged storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp: Auto merged storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp: Auto merged storage/ndb/src/kernel/blocks/dbacc/DbaccInit.cpp: Auto merged storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp: Auto merged storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp: Auto merged storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp: Auto merged storage/ndb/src/kernel/blocks/dbdict/SchemaFile.hpp: Auto merged storage/ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp: Auto merged storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp: Auto merged storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp: Auto merged storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Auto merged storage/ndb/src/kernel/blocks/dbdih/Sysfile.hpp: Auto merged storage/ndb/src/kernel/blocks/dbdih/printSysfile/printSysfile.cpp: Auto merged storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp: Auto merged storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp: Auto merged storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Auto merged storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.cpp: Auto merged storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.hpp: Auto merged storage/ndb/src/kernel/blocks/dblqh/redoLogReader/redoLogFileReader.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp: Auto merged storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/AttributeOffset.hpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupBuffer.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupDebug.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupFixAlloc.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupPagMan.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupStoredProcDef.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupTabDesMan.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtux/Dbtux.hpp: Auto merged storage/ndb/src/kernel/blocks/dbtux/DbtuxCmp.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtux/DbtuxMaint.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtux/DbtuxNode.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtux/DbtuxSearch.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtux/DbtuxTree.cpp: Auto merged storage/ndb/src/kernel/blocks/dbutil/DbUtil.cpp: Auto merged storage/ndb/src/kernel/blocks/dbutil/DbUtil.hpp: Auto merged storage/ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp: Auto merged storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp: Auto merged storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp: Auto merged storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrSysTable.cpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/AsyncFileTest/AsyncFileTest.cpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/CircularIndex.cpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/CircularIndex.hpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/Filename.cpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/Filename.hpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/MemoryChannel.cpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/MemoryChannel.hpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/MemoryChannelTest/MemoryChannelTest.cpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.hpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/OpenFiles.hpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/Pool.hpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/VoidFs.cpp: Auto merged storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp: Auto merged storage/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp: Auto merged storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp: Auto merged storage/ndb/src/kernel/blocks/qmgr/timer.hpp: Auto merged storage/ndb/src/kernel/blocks/suma/Suma.cpp: Auto merged storage/ndb/src/kernel/blocks/suma/Suma.hpp: Auto merged storage/ndb/src/kernel/blocks/suma/SumaInit.cpp: Auto merged storage/ndb/src/kernel/blocks/trix/Trix.cpp: Auto merged storage/ndb/src/kernel/blocks/trix/Trix.hpp: Auto merged storage/ndb/src/kernel/error/ErrorHandlingMacros.hpp: Auto merged storage/ndb/src/kernel/error/ErrorReporter.cpp: Auto merged storage/ndb/src/kernel/error/ErrorReporter.hpp: Auto merged storage/ndb/src/kernel/error/TimeModule.cpp: Auto merged storage/ndb/src/kernel/error/TimeModule.hpp: Auto merged storage/ndb/src/kernel/error/ndbd_exit_codes.c: Auto merged storage/ndb/src/kernel/vm/Array.hpp: Auto merged storage/ndb/src/kernel/vm/ArrayPool.hpp: Auto merged storage/ndb/src/kernel/vm/CArray.hpp: Auto merged storage/ndb/src/kernel/vm/Callback.hpp: Auto merged storage/ndb/src/kernel/vm/ClusterConfiguration.cpp: Auto merged storage/ndb/src/kernel/vm/ClusterConfiguration.hpp: Auto merged storage/ndb/src/kernel/vm/Configuration.cpp: Auto merged storage/ndb/src/kernel/vm/Configuration.hpp: Auto merged storage/ndb/src/kernel/vm/DLFifoList.hpp: Auto merged storage/ndb/src/kernel/vm/DLHashTable.hpp: Auto merged storage/ndb/src/kernel/vm/DLHashTable2.hpp: Auto merged storage/ndb/src/kernel/vm/DLList.hpp: Auto merged storage/ndb/src/kernel/vm/DataBuffer.hpp: Auto merged storage/ndb/src/kernel/vm/Emulator.cpp: Auto merged storage/ndb/src/kernel/vm/Emulator.hpp: Auto merged storage/ndb/src/kernel/vm/FastScheduler.cpp: Auto merged storage/ndb/src/kernel/vm/FastScheduler.hpp: Auto merged storage/ndb/src/kernel/vm/GlobalData.hpp: Auto merged storage/ndb/src/kernel/vm/KeyDescriptor.hpp: Auto merged storage/ndb/src/kernel/vm/KeyTable.hpp: Auto merged storage/ndb/src/kernel/vm/KeyTable2.hpp: Auto merged storage/ndb/src/kernel/vm/LongSignal.hpp: Auto merged storage/ndb/src/kernel/vm/Mutex.cpp: Auto merged storage/ndb/src/kernel/vm/Mutex.hpp: Auto merged storage/ndb/src/kernel/vm/Prio.hpp: Auto merged storage/ndb/src/kernel/vm/RequestTracker.hpp: Auto merged storage/ndb/src/kernel/vm/SLList.hpp: Auto merged storage/ndb/src/kernel/vm/SafeCounter.cpp: Auto merged storage/ndb/src/kernel/vm/SafeCounter.hpp: Auto merged storage/ndb/src/kernel/vm/SectionReader.cpp: Auto merged storage/ndb/src/kernel/vm/SectionReader.hpp: Auto merged storage/ndb/src/kernel/vm/SignalCounter.hpp: Auto merged storage/ndb/src/kernel/vm/SimBlockList.hpp: Auto merged storage/ndb/src/kernel/vm/SimplePropertiesSection.cpp: Auto merged storage/ndb/src/kernel/vm/SimulatedBlock.cpp: Auto merged storage/ndb/src/kernel/vm/SimulatedBlock.hpp: Auto merged storage/ndb/src/kernel/vm/SuperPool.cpp: Auto merged storage/ndb/src/kernel/vm/SuperPool.hpp: Auto merged storage/ndb/src/kernel/vm/ThreadConfig.cpp: Auto merged storage/ndb/src/kernel/vm/ThreadConfig.hpp: Auto merged storage/ndb/src/kernel/vm/TimeQueue.cpp: Auto merged storage/ndb/src/kernel/vm/TimeQueue.hpp: Auto merged storage/ndb/src/kernel/vm/TransporterCallback.cpp: Auto merged storage/ndb/src/kernel/vm/VMSignal.cpp: Auto merged storage/ndb/src/kernel/vm/VMSignal.hpp: Auto merged storage/ndb/src/kernel/vm/WaitQueue.hpp: Auto merged storage/ndb/src/kernel/vm/WatchDog.cpp: Auto merged storage/ndb/src/kernel/vm/WatchDog.hpp: Auto merged storage/ndb/src/kernel/vm/al_test/arrayListTest.cpp: Auto merged storage/ndb/src/kernel/vm/al_test/arrayPoolTest.cpp: Auto merged storage/ndb/src/kernel/vm/al_test/main.cpp: Auto merged storage/ndb/src/kernel/vm/ndbd_malloc.cpp: Auto merged storage/ndb/src/kernel/vm/ndbd_malloc.hpp: Auto merged storage/ndb/src/kernel/vm/pc.hpp: Auto merged storage/ndb/src/kernel/vm/testCopy/rr.cpp: Auto merged storage/ndb/src/kernel/vm/testCopy/testCopy.cpp: Auto merged storage/ndb/src/kernel/vm/testDataBuffer/testDataBuffer.cpp: Auto merged storage/ndb/src/kernel/vm/testLongSig/testLongSig.cpp: Auto merged storage/ndb/src/kernel/vm/testSimplePropertiesSection/test.cpp: Auto merged storage/ndb/src/kernel/vm/testSuperPool.cpp: Auto merged storage/ndb/src/mgmapi/LocalConfig.cpp: Auto merged storage/ndb/src/mgmapi/LocalConfig.hpp: Auto merged storage/ndb/src/mgmapi/mgmapi.cpp: Auto merged storage/ndb/src/mgmapi/mgmapi_configuration.hpp: Auto merged storage/ndb/src/mgmapi/mgmapi_internal.h: Auto merged storage/ndb/src/mgmapi/ndb_logevent.cpp: Auto merged storage/ndb/src/mgmapi/ndb_logevent.hpp: Auto merged storage/ndb/src/mgmapi/test/keso.c: Auto merged storage/ndb/src/mgmapi/test/mgmSrvApi.cpp: Auto merged storage/ndb/src/mgmclient/CommandInterpreter.cpp: Auto merged storage/ndb/src/mgmclient/main.cpp: Auto merged storage/ndb/src/mgmclient/ndb_mgmclient.hpp: Auto merged storage/ndb/src/mgmclient/ndb_mgmclient.h: Auto merged storage/ndb/src/mgmclient/test_cpcd/test_cpcd.cpp: Auto merged storage/ndb/src/mgmsrv/Config.cpp: Auto merged storage/ndb/src/mgmsrv/Config.hpp: Auto merged storage/ndb/src/mgmsrv/ConfigInfo.cpp: Auto merged storage/ndb/src/mgmsrv/ConfigInfo.hpp: Auto merged storage/ndb/src/mgmsrv/InitConfigFileParser.cpp: Auto merged storage/ndb/src/mgmsrv/InitConfigFileParser.hpp: Auto merged storage/ndb/src/mgmsrv/MgmtSrvr.cpp: Auto merged storage/ndb/src/mgmsrv/MgmtSrvr.hpp: Auto merged storage/ndb/src/mgmsrv/MgmtSrvrConfig.cpp: Auto merged storage/ndb/src/mgmsrv/MgmtSrvrGeneralSignalHandling.cpp: Auto merged storage/ndb/src/mgmsrv/Services.cpp: Auto merged storage/ndb/src/mgmsrv/Services.hpp: Auto merged storage/ndb/src/mgmsrv/SignalQueue.cpp: Auto merged storage/ndb/src/mgmsrv/SignalQueue.hpp: Auto merged storage/ndb/src/mgmsrv/convertStrToInt.cpp: Auto merged storage/ndb/src/mgmsrv/convertStrToInt.hpp: Auto merged storage/ndb/src/mgmsrv/main.cpp: Auto merged storage/ndb/src/mgmsrv/mkconfig/mkconfig.cpp: Auto merged storage/ndb/src/ndbapi/API.hpp: Auto merged storage/ndb/src/ndbapi/ClusterMgr.cpp: Auto merged storage/ndb/src/ndbapi/ClusterMgr.hpp: Auto merged storage/ndb/src/ndbapi/DictCache.cpp: Auto merged storage/ndb/src/ndbapi/DictCache.hpp: Auto merged storage/ndb/src/ndbapi/Ndb.cpp: Auto merged storage/ndb/src/ndbapi/NdbApiSignal.cpp: Auto merged storage/ndb/src/ndbapi/NdbApiSignal.hpp: Auto merged storage/ndb/src/ndbapi/NdbBlob.cpp: Auto merged storage/ndb/src/ndbapi/NdbBlobImpl.hpp: Auto merged storage/ndb/src/ndbapi/NdbDictionary.cpp: Auto merged storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp: Auto merged storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp: Auto merged storage/ndb/src/ndbapi/NdbErrorOut.cpp: Auto merged storage/ndb/src/ndbapi/NdbEventOperation.cpp: Auto merged storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp: Auto merged storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp: Auto merged storage/ndb/src/ndbapi/NdbImpl.hpp: Auto merged storage/ndb/src/ndbapi/NdbIndexOperation.cpp: Auto merged storage/ndb/src/ndbapi/NdbLinHash.hpp: Auto merged storage/ndb/src/ndbapi/NdbOperation.cpp: Auto merged storage/ndb/src/ndbapi/NdbOperationDefine.cpp: Auto merged storage/ndb/src/ndbapi/NdbOperationExec.cpp: Auto merged storage/ndb/src/ndbapi/NdbOperationInt.cpp: Auto merged storage/ndb/src/ndbapi/NdbOperationScan.cpp: Auto merged storage/ndb/src/ndbapi/NdbOperationSearch.cpp: Auto merged storage/ndb/src/ndbapi/NdbPool.cpp: Auto merged storage/ndb/src/ndbapi/NdbPoolImpl.cpp: Auto merged storage/ndb/src/ndbapi/NdbPoolImpl.hpp: Auto merged storage/ndb/src/ndbapi/NdbRecAttr.cpp: Auto merged storage/ndb/src/ndbapi/NdbReceiver.cpp: Auto merged storage/ndb/src/ndbapi/NdbScanFilter.cpp: Auto merged storage/ndb/src/ndbapi/NdbScanOperation.cpp: Auto merged storage/ndb/src/ndbapi/NdbTransaction.cpp: Auto merged storage/ndb/src/ndbapi/NdbTransactionScan.cpp: Auto merged storage/ndb/src/ndbapi/NdbUtil.cpp: Auto merged storage/ndb/src/ndbapi/NdbUtil.hpp: Auto merged storage/ndb/src/ndbapi/NdbWaiter.hpp: Auto merged storage/ndb/src/ndbapi/Ndberr.cpp: Auto merged storage/ndb/src/ndbapi/Ndbif.cpp: Auto merged storage/ndb/src/ndbapi/Ndbinit.cpp: Auto merged storage/ndb/src/ndbapi/Ndblist.cpp: Auto merged storage/ndb/src/ndbapi/ObjectMap.hpp: Auto merged storage/ndb/src/ndbapi/SignalSender.cpp: Auto merged storage/ndb/src/ndbapi/SignalSender.hpp: Auto merged storage/ndb/src/ndbapi/TransporterFacade.cpp: Auto merged storage/ndb/src/ndbapi/TransporterFacade.hpp: Auto merged storage/ndb/src/ndbapi/ndb_cluster_connection.cpp: Auto merged storage/ndb/src/ndbapi/ndb_cluster_connection_impl.hpp: Auto merged storage/ndb/src/ndbapi/ndberror.c: Auto merged storage/ndb/src/ndbapi/signal-sender/SignalSender.cpp: Auto merged storage/ndb/src/ndbapi/signal-sender/SignalSender.hpp: Auto merged storage/ndb/test/include/CpcClient.hpp: Auto merged storage/ndb/test/include/HugoAsynchTransactions.hpp: Auto merged storage/ndb/test/include/HugoCalculator.hpp: Auto merged storage/ndb/test/include/HugoOperations.hpp: Auto merged storage/ndb/test/include/HugoTransactions.hpp: Auto merged storage/ndb/test/include/NDBT.hpp: Auto merged storage/ndb/test/include/NDBT_DataSet.hpp: Auto merged storage/ndb/test/include/NDBT_DataSetTransaction.hpp: Auto merged storage/ndb/test/include/NDBT_Error.hpp: Auto merged storage/ndb/test/include/NDBT_Output.hpp: Auto merged storage/ndb/test/include/NDBT_ResultRow.hpp: Auto merged storage/ndb/test/include/NDBT_ReturnCodes.h: Auto merged storage/ndb/test/include/NDBT_Stats.hpp: Auto merged storage/ndb/test/include/NDBT_Table.hpp: Auto merged storage/ndb/test/include/NDBT_Tables.hpp: Auto merged storage/ndb/test/include/NDBT_Test.hpp: Auto merged storage/ndb/test/include/NdbBackup.hpp: Auto merged storage/ndb/test/include/NdbConfig.hpp: Auto merged storage/ndb/test/include/NdbGrep.hpp: Auto merged storage/ndb/test/include/NdbRestarter.hpp: Auto merged storage/ndb/test/include/NdbRestarts.hpp: Auto merged storage/ndb/test/include/NdbSchemaCon.hpp: Auto merged storage/ndb/test/include/NdbSchemaOp.hpp: Auto merged storage/ndb/test/include/NdbTest.hpp: Auto merged storage/ndb/test/include/NdbTimer.hpp: Auto merged storage/ndb/test/include/TestNdbEventOperation.hpp: Auto merged storage/ndb/test/include/UtilTransactions.hpp: Auto merged storage/ndb/test/include/getarg.h: Auto merged storage/ndb/test/ndbapi/InsertRecs.cpp: Auto merged storage/ndb/test/ndbapi/ScanFilter.hpp: Auto merged storage/ndb/test/ndbapi/ScanFunctions.hpp: Auto merged storage/ndb/test/ndbapi/ScanInterpretTest.hpp: Auto merged storage/ndb/test/ndbapi/TraceNdbApi.cpp: Auto merged storage/ndb/test/ndbapi/VerifyNdbApi.cpp: Auto merged storage/ndb/test/ndbapi/acid.cpp: Auto merged storage/ndb/test/ndbapi/acid2.cpp: Auto merged storage/ndb/test/ndbapi/adoInsertRecs.cpp: Auto merged storage/ndb/test/ndbapi/asyncGenerator.cpp: Auto merged storage/ndb/test/ndbapi/benchronja.cpp: Auto merged storage/ndb/test/ndbapi/bulk_copy.cpp: Auto merged storage/ndb/test/ndbapi/cdrserver.cpp: Auto merged storage/ndb/test/ndbapi/celloDb.cpp: Auto merged storage/ndb/test/ndbapi/create_all_tabs.cpp: Auto merged storage/ndb/test/ndbapi/create_tab.cpp: Auto merged storage/ndb/test/ndbapi/drop_all_tabs.cpp: Auto merged storage/ndb/test/ndbapi/flexAsynch.cpp: Auto merged storage/ndb/test/ndbapi/flexBench.cpp: Auto merged storage/ndb/test/ndbapi/flexHammer.cpp: Auto merged storage/ndb/test/ndbapi/flexScan.cpp: Auto merged storage/ndb/test/ndbapi/flexTT.cpp: Auto merged storage/ndb/test/ndbapi/flexTimedAsynch.cpp: Auto merged storage/ndb/test/ndbapi/flex_bench_mysql.cpp: Auto merged storage/ndb/test/ndbapi/index.cpp: Auto merged storage/ndb/test/ndbapi/index2.cpp: Auto merged storage/ndb/test/ndbapi/initronja.cpp: Auto merged storage/ndb/test/ndbapi/interpreterInTup.cpp: Auto merged storage/ndb/test/ndbapi/mainAsyncGenerator.cpp: Auto merged storage/ndb/test/ndbapi/msa.cpp: Auto merged storage/ndb/test/ndbapi/ndb_async1.cpp: Auto merged storage/ndb/test/ndbapi/ndb_async2.cpp: Auto merged storage/ndb/test/ndbapi/ndb_user_populate.cpp: Auto merged storage/ndb/test/ndbapi/ndb_user_transaction.cpp: Auto merged storage/ndb/test/ndbapi/ndb_user_transaction2.cpp: Auto merged storage/ndb/test/ndbapi/ndb_user_transaction3.cpp: Auto merged storage/ndb/test/ndbapi/ndb_user_transaction4.cpp: Auto merged storage/ndb/test/ndbapi/ndb_user_transaction5.cpp: Auto merged storage/ndb/test/ndbapi/ndb_user_transaction6.cpp: Auto merged storage/ndb/test/ndbapi/restarter.cpp: Auto merged storage/ndb/test/ndbapi/restarter2.cpp: Auto merged storage/ndb/test/ndbapi/restarts.cpp: Auto merged storage/ndb/test/ndbapi/size.cpp: Auto merged storage/ndb/test/ndbapi/testBackup.cpp: Auto merged storage/ndb/test/ndbapi/testBasic.cpp: Auto merged storage/ndb/test/ndbapi/testBasicAsynch.cpp: Auto merged storage/ndb/test/ndbapi/testBlobs.cpp: Auto merged storage/ndb/test/ndbapi/testDataBuffers.cpp: Auto merged storage/ndb/test/ndbapi/testDeadlock.cpp: Auto merged storage/ndb/test/ndbapi/testDict.cpp: Auto merged storage/ndb/test/ndbapi/testGrepVerify.cpp: Auto merged storage/ndb/test/ndbapi/testIndex.cpp: Auto merged storage/ndb/test/ndbapi/testInterpreter.cpp: Auto merged storage/ndb/test/ndbapi/testMgm.cpp: Auto merged storage/ndb/test/ndbapi/testNdbApi.cpp: Auto merged storage/ndb/test/ndbapi/testNodeRestart.cpp: Auto merged storage/ndb/test/ndbapi/testOIBasic.cpp: Auto merged storage/ndb/test/ndbapi/testOperations.cpp: Auto merged storage/ndb/test/ndbapi/testOrderedIndex.cpp: Auto merged storage/ndb/test/ndbapi/testPartitioning.cpp: Auto merged storage/ndb/test/ndbapi/testReadPerf.cpp: Auto merged storage/ndb/test/ndbapi/bank/Bank.cpp: Auto merged storage/ndb/test/ndbapi/bank/Bank.hpp: Auto merged storage/ndb/test/ndbapi/bank/BankLoad.cpp: Auto merged storage/ndb/test/ndbapi/bank/bankCreator.cpp: Auto merged storage/ndb/test/ndbapi/bank/bankMakeGL.cpp: Auto merged storage/ndb/test/ndbapi/bank/bankSumAccounts.cpp: Auto merged storage/ndb/test/ndbapi/bank/bankTimer.cpp: Auto merged storage/ndb/test/ndbapi/bank/bankTransactionMaker.cpp: Auto merged storage/ndb/test/ndbapi/bank/bankValidateAllGLs.cpp: Auto merged storage/ndb/test/ndbapi/bank/testBank.cpp: Auto merged storage/ndb/test/ndbapi/bench/asyncGenerator.cpp: Auto merged storage/ndb/test/ndbapi/bench/dbGenerator.h: Auto merged storage/ndb/test/ndbapi/bench/dbPopulate.cpp: Auto merged storage/ndb/test/ndbapi/bench/dbPopulate.h: Auto merged storage/ndb/test/ndbapi/bench/macros.h: Auto merged storage/ndb/test/ndbapi/bench/mainAsyncGenerator.cpp: Auto merged storage/ndb/test/ndbapi/bench/mainPopulate.cpp: Auto merged storage/ndb/test/ndbapi/bench/ndb_async1.cpp: Auto merged storage/ndb/test/ndbapi/bench/ndb_async2.cpp: Auto merged storage/ndb/test/ndbapi/testRestartGci.cpp: Auto merged storage/ndb/test/ndbapi/testSRBank.cpp: Auto merged storage/ndb/test/ndbapi/testScan.cpp: Auto merged storage/ndb/test/ndbapi/testScanInterpreter.cpp: Auto merged storage/ndb/test/ndbapi/testScanPerf.cpp: Auto merged storage/ndb/test/ndbapi/testSystemRestart.cpp: Auto merged storage/ndb/test/ndbapi/testTimeout.cpp: Auto merged storage/ndb/test/ndbapi/testTransactions.cpp: Auto merged storage/ndb/test/ndbapi/test_event.cpp: Auto merged storage/ndb/test/ndbapi/test_event_merge.cpp: Auto merged storage/ndb/test/ndbapi/test_event_multi_table.cpp: Auto merged storage/ndb/test/ndbapi/userInterface.cpp: Auto merged storage/ndb/test/ndbapi/bench/ndb_error.hpp: Auto merged storage/ndb/test/ndbapi/bench/ndb_schema.hpp: Auto merged storage/ndb/test/ndbapi/bench/ndb_user_transaction.cpp: Auto merged storage/ndb/test/ndbapi/bench/ndb_user_transaction2.cpp: Auto merged storage/ndb/test/ndbapi/bench/ndb_user_transaction3.cpp: Auto merged storage/ndb/test/ndbapi/bench/ndb_user_transaction4.cpp: Auto merged storage/ndb/test/ndbapi/bench/ndb_user_transaction5.cpp: Auto merged storage/ndb/test/ndbapi/bench/ndb_user_transaction6.cpp: Auto merged storage/ndb/test/ndbapi/bench/testData.h: Auto merged storage/ndb/test/ndbapi/bench/testDefinitions.h: Auto merged storage/ndb/test/ndbapi/bench/userInterface.cpp: Auto merged storage/ndb/test/ndbapi/bench/userInterface.h: Auto merged storage/ndb/test/newtonapi/basic_test/basic/basic.cpp: Auto merged storage/ndb/test/newtonapi/basic_test/bulk_read/br_test.cpp: Auto merged storage/ndb/test/newtonapi/basic_test/common.cpp: Auto merged storage/ndb/test/newtonapi/basic_test/common.hpp: Auto merged storage/ndb/test/newtonapi/basic_test/ptr_binding/ptr_binding_test.cpp: Auto merged storage/ndb/test/newtonapi/basic_test/too_basic.cpp: Auto merged storage/ndb/test/newtonapi/perf_test/perf.cpp: Auto merged storage/ndb/test/odbc/SQL99_test/SQL99_test.cpp: Auto merged storage/ndb/test/odbc/SQL99_test/SQL99_test.h: Auto merged storage/ndb/test/odbc/client/NDBT_ALLOCHANDLE.cpp: Auto merged storage/ndb/test/odbc/client/NDBT_ALLOCHANDLE_HDBC.cpp: Auto merged storage/ndb/test/odbc/client/NDBT_SQLConnect.cpp: Auto merged storage/ndb/test/odbc/client/NDBT_SQLPrepare.cpp: Auto merged storage/ndb/test/odbc/client/SQLAllocEnvTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLAllocHandleTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLAllocHandleTest_bf.cpp: Auto merged storage/ndb/test/odbc/client/SQLBindColTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLBindParameterTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLCancelTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLCloseCursorTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLColAttributeTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLColAttributeTest1.cpp: Auto merged storage/ndb/test/odbc/client/SQLColAttributeTest2.cpp: Auto merged storage/ndb/test/odbc/client/SQLColAttributeTest3.cpp: Auto merged storage/ndb/test/odbc/client/SQLConnectTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLCopyDescTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLDescribeColTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLDisconnectTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLDriverConnectTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLEndTranTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLErrorTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLExecDirectTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLExecuteTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLFetchScrollTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLFetchTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLFreeHandleTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLFreeStmtTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLGetConnectAttrTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLGetCursorNameTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLGetDataTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLGetDescFieldTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLGetDescRecTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLGetDiagFieldTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLGetDiagRecSimpleTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLGetDiagRecTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLGetEnvAttrTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLGetFunctionsTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLGetInfoTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLGetStmtAttrTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLGetTypeInfoTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLMoreResultsTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLNumResultColsTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLParamDataTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLPrepareTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLPutDataTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLRowCountTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLSetConnectAttrTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLSetCursorNameTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLSetDescFieldTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLSetDescRecTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLSetEnvAttrTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLSetStmtAttrTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLTablesTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLTransactTest.cpp: Auto merged storage/ndb/test/odbc/client/common.hpp: Auto merged storage/ndb/test/odbc/client/main.cpp: Auto merged storage/ndb/test/odbc/driver/testOdbcDriver.cpp: Auto merged storage/ndb/test/odbc/test_compiler/test_compiler.cpp: Auto merged storage/ndb/test/run-test/main.cpp: Auto merged storage/ndb/test/run-test/run-test.hpp: Auto merged storage/ndb/test/src/CpcClient.cpp: Auto merged storage/ndb/test/src/HugoAsynchTransactions.cpp: Auto merged storage/ndb/test/src/HugoCalculator.cpp: Auto merged storage/ndb/test/src/HugoOperations.cpp: Auto merged storage/ndb/test/src/HugoTransactions.cpp: Auto merged storage/ndb/test/src/NDBT_Error.cpp: Auto merged storage/ndb/test/src/NDBT_Output.cpp: Auto merged storage/ndb/test/src/NDBT_ResultRow.cpp: Auto merged storage/ndb/test/src/NDBT_ReturnCodes.cpp: Auto merged storage/ndb/test/src/NDBT_Table.cpp: Auto merged storage/ndb/test/src/NDBT_Tables.cpp: Auto merged storage/ndb/test/src/NDBT_Test.cpp: Auto merged storage/ndb/test/src/NdbBackup.cpp: Auto merged storage/ndb/test/src/NdbConfig.cpp: Auto merged storage/ndb/test/src/NdbGrep.cpp: Auto merged storage/ndb/test/src/NdbRestarter.cpp: Auto merged storage/ndb/test/src/NdbRestarts.cpp: Auto merged storage/ndb/test/src/NdbSchemaCon.cpp: Auto merged storage/ndb/test/src/NdbSchemaOp.cpp: Auto merged storage/ndb/test/src/UtilTransactions.cpp: Auto merged storage/ndb/test/tools/copy_tab.cpp: Auto merged storage/ndb/test/tools/cpcc.cpp: Auto merged storage/ndb/test/tools/create_index.cpp: Auto merged storage/ndb/test/tools/hugoCalculator.cpp: Auto merged storage/ndb/test/tools/hugoFill.cpp: Auto merged storage/ndb/test/tools/hugoLoad.cpp: Auto merged storage/ndb/test/tools/hugoLockRecords.cpp: Auto merged storage/ndb/test/tools/hugoPkDelete.cpp: Auto merged storage/ndb/test/tools/hugoPkRead.cpp: Auto merged storage/ndb/test/tools/hugoPkReadRecord.cpp: Auto merged storage/ndb/test/tools/hugoPkUpdate.cpp: Auto merged storage/ndb/test/tools/hugoScanRead.cpp: Auto merged storage/ndb/test/tools/hugoScanUpdate.cpp: Auto merged storage/ndb/test/tools/restart.cpp: Auto merged storage/ndb/test/tools/transproxy.cpp: Auto merged storage/ndb/test/tools/verify_index.cpp: Auto merged storage/ndb/tools/delete_all.cpp: Auto merged storage/ndb/tools/desc.cpp: Auto merged storage/ndb/tools/drop_index.cpp: Auto merged storage/ndb/tools/drop_tab.cpp: Auto merged storage/ndb/tools/listTables.cpp: Auto merged storage/ndb/tools/ndb_condig.cpp: Auto merged storage/ndb/tools/ndb_test_platform.cpp: Auto merged storage/ndb/tools/ndbsql.cpp: Auto merged storage/ndb/tools/restore/Restore.cpp: Auto merged storage/ndb/tools/restore/Restore.hpp: Auto merged storage/ndb/tools/restore/consumer.cpp: Auto merged storage/ndb/tools/restore/consumer.hpp: Auto merged storage/ndb/tools/restore/consumer_printer.cpp: Auto merged storage/ndb/tools/restore/consumer_printer.hpp: Auto merged storage/ndb/tools/restore/consumer_restore.cpp: Auto merged storage/ndb/tools/restore/consumer_restore.hpp: Auto merged storage/ndb/tools/restore/consumer_restorem.cpp: Auto merged storage/ndb/tools/restore/restore_main.cpp: Auto merged storage/ndb/tools/select_all.cpp: Auto merged storage/ndb/tools/select_count.cpp: Auto merged storage/ndb/tools/waiter.cpp: Auto merged strings/Makefile.am: Auto merged strings/ctype-big5.c: Auto merged strings/ctype-bin.c: Auto merged strings/ctype-cp932.c: Auto merged strings/ctype-euc_kr.c: Auto merged strings/ctype-eucjpms.c: Auto merged strings/ctype-gb2312.c: Auto merged strings/ctype-gbk.c: Auto merged strings/ctype-latin1.c: Auto merged strings/ctype-mb.c: Auto merged strings/ctype-simple.c: Auto merged strings/ctype-sjis.c: Auto merged strings/ctype-tis620.c: Auto merged strings/ctype-ucs2.c: Auto merged strings/ctype-ujis.c: Auto merged strings/ctype-utf8.c: Auto merged strings/ctype-win1250ch.c: Auto merged strings/ctype.c: Auto merged strings/decimal.c: Auto merged strings/strxnmov.c: Auto merged strings/xml.c: Auto merged tests/Makefile.am: Auto merged tests/mysql_client_test.c: Auto merged vio/Makefile.am: Auto merged vio/vio.c: Auto merged vio/viosocket.c: Auto merged vio/viossl.c: Auto merged vio/viosslfactories.c: Auto merged zlib/Makefile.am: Auto merged
1627 lines
70 KiB
C++
1627 lines
70 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 */
|
|
|
|
/* **************************************************************** */
|
|
/* */
|
|
/* S E R V . T C P */
|
|
/* * This is an example program that demonstrates the use of */
|
|
/* stream sockets as an IPC mechanism. This contains the server, */
|
|
/* and is intended to operate in conjunction with the client */
|
|
/* program found in client.tcp. Together, these two programs */
|
|
/* demonstrate many of the features of sockets, as well as good */
|
|
/* conventions for using these features. */
|
|
/* * This program provides a service called "example". In order for*/
|
|
/* it to function, an entry for it needs to exist in the */
|
|
/* ./etc/services file. The port address for this service can be */
|
|
/* any port number that is likely to be unused, such as 22375, */
|
|
/* for example. The host on which the client will be running */
|
|
/* must also have the same entry (same port number) in its */
|
|
/* ./etc/services file. */
|
|
/* **************************************************************** */
|
|
|
|
#include <ndb_global.h>
|
|
|
|
/******** NDB INCLUDE ******/
|
|
#include <NdbApi.hpp>
|
|
/***************************/
|
|
/*#include <sys/shm.h>*/
|
|
#include <pthread.h>
|
|
#include <sys/sem.h>
|
|
#include <sys/shm.h>
|
|
#include <netinet/in.h>
|
|
#include <signal.h>
|
|
#include <netdb.h>
|
|
#include <time.h>
|
|
#include <synch.h>
|
|
#include <sched.h>
|
|
|
|
extern "C" {
|
|
#include "utv.h"
|
|
#include "vcdrfunc.h"
|
|
#include "bcd.h"
|
|
}
|
|
|
|
#ifndef TESTLEV
|
|
#define TESTLEV
|
|
#endif
|
|
//#define DEBUG
|
|
//#define MYDEBUG
|
|
//#define SETDBG
|
|
|
|
//#define ops_before_exe 64
|
|
#define MAXOPSEXEC 1024
|
|
|
|
/* Used in nanosleep */
|
|
/**** NDB ********/
|
|
static int bTestPassed;
|
|
void create_table(Ndb* pMyNdb);
|
|
void error_handler(const char* errorText);
|
|
/*****************/
|
|
static struct timespec tmspec1;
|
|
static int server(long int);
|
|
|
|
/* Function for initiating the cdr-area and make it clean for ongoing calls */
|
|
|
|
static int s; /* connected socket descriptor */
|
|
static int ls; /* listen socket descriptor */
|
|
|
|
static struct hostent *hp; /* pointer to host info for remote host */
|
|
static struct servent *sp; /* pointer to service information */
|
|
|
|
struct linger linger; /* allow a lingering, graceful close; */
|
|
/* used when setting SO_LINGER */
|
|
|
|
static struct sockaddr_in myaddr_in; /* for local socket address */
|
|
static struct sockaddr_in peeraddr_in; /* for peer socket address */
|
|
|
|
static FILE *fi; /* Log output */
|
|
static char temp[600]="";
|
|
|
|
static int ops_before_exe = 1; /* Number of operations per execute, default is 1,
|
|
but it can be changed with the -o parameter. */
|
|
|
|
/*----------------------------------------------------------------------
|
|
|
|
M A I N
|
|
* This routine starts the server. It forks, leaving the child
|
|
to do all the work, so it does not have to be run in the
|
|
background. It sets up the listen socket, and for each incoming
|
|
connection, it forks a child process to process the data. It
|
|
will loop forever, until killed by a signal.
|
|
|
|
----------------------------------------------------------------------*/
|
|
|
|
/****** NDB *******/
|
|
static char *tableName = "VWTABLE";
|
|
/******************/
|
|
|
|
#include <iostream>
|
|
using namespace std;
|
|
|
|
int main(int argc, const char** argv)
|
|
{
|
|
ndb_init();
|
|
/******** NDB ***********/
|
|
/*
|
|
Ndb MyNdb( "TEST_DB" );
|
|
int tTableId;
|
|
*/
|
|
/************************/
|
|
char tmpbuf[400];
|
|
/* Loop and status variables */
|
|
int i,j,found;
|
|
|
|
/* Used by the server */
|
|
int addrlen;
|
|
|
|
/* return code used with functions */
|
|
int rc;
|
|
|
|
i = 1;
|
|
while (argc > 1)
|
|
{
|
|
if (strcmp(argv[i], "-o") == 0)
|
|
{
|
|
ops_before_exe = atoi(argv[i+1]);
|
|
if ((ops_before_exe < 1) || (ops_before_exe > MAXOPSEXEC))
|
|
{
|
|
cout << "Number of operations per execute must be at least 1, and at most " << MAXOPSEXEC << endl;
|
|
exit(1);
|
|
}
|
|
|
|
}
|
|
else
|
|
{
|
|
cout << "Invalid parameter!" << endl << "Look in cdrserver.C for more info." << endl;
|
|
exit(1);
|
|
}
|
|
|
|
argc -= 2;
|
|
i = i + 2;
|
|
}
|
|
|
|
|
|
/* Setup log handling */
|
|
logname(temp,"Cdrserver","Mother","");
|
|
puts(temp);
|
|
fi=fopen(temp,"w");
|
|
if (fi == NULL)
|
|
{
|
|
perror(argv[0]);
|
|
exit(EXIT_FAILURE);
|
|
}
|
|
m2log(fi,"Initiation of program");
|
|
|
|
/***** NDB ******/
|
|
/*
|
|
MyNdb.init();
|
|
if (MyNdb.waitUntilReady(30) != 0)
|
|
{
|
|
puts("Not ready");
|
|
exit(-1);
|
|
}
|
|
tTableId = MyNdb.getTable()->openTable(tableName);
|
|
if (tTableId == -1)
|
|
{
|
|
printf("%d: Creating table",getpid());
|
|
create_table(&MyNdb);
|
|
}
|
|
else printf("%d: Table already create",getpid());
|
|
*/
|
|
|
|
/****************/
|
|
|
|
/* clear out address structures */
|
|
memset ((char *)&myaddr_in, 0, sizeof(struct sockaddr_in));
|
|
memset ((char *)&peeraddr_in, 0, sizeof(struct sockaddr_in));
|
|
|
|
m2log(fi,"Socket setup starting");
|
|
|
|
/* Set up address structure for the listen socket. */
|
|
myaddr_in.sin_family = AF_INET;
|
|
|
|
/* The server should listen on the wildcard address, */
|
|
/* rather than its own internet address. This is */
|
|
/* generally good practice for servers, because on */
|
|
/* systems which are connected to more than one */
|
|
/* network at once will be able to have one server */
|
|
/* listening on all networks at once. Even when the */
|
|
/* host is connected to only one network, this is good */
|
|
/* practice, because it makes the server program more */
|
|
/* portable. */
|
|
|
|
myaddr_in.sin_addr.s_addr = INADDR_ANY;
|
|
/* Find the information for the "cdrserver" server */
|
|
/* in order to get the needed port number. */
|
|
|
|
sp = getservbyname ("cdrserver", "tcp");
|
|
if (sp == NULL) {
|
|
m2log(fi,"Service cdrserver not found in /etc/services");
|
|
m2log(fi,"Terminating.");
|
|
exit(EXIT_FAILURE);
|
|
}
|
|
|
|
myaddr_in.sin_port = sp->s_port;
|
|
|
|
/* Create the listen socket.i */
|
|
|
|
ls = socket (AF_INET, SOCK_STREAM, 0);
|
|
if (ls == -1) {
|
|
m2log(fi,"Unable to create socket");
|
|
m2log(fi,"Terminating.");
|
|
exit(EXIT_FAILURE);
|
|
}
|
|
printf("Socket created\n");
|
|
printf("Wait..........\n");
|
|
/* Bind the listen address to the socket. */
|
|
if (bind(ls,(struct sockaddr*)&myaddr_in, sizeof(struct sockaddr_in)) == -1) {
|
|
m2log(fi,"Unable to bind address");
|
|
m2log(fi,"Terminating.");
|
|
exit(EXIT_FAILURE);
|
|
}
|
|
|
|
/* Initiate the listen on the socket so remote users */
|
|
/* can connect. The listen backlog is set to 5, which */
|
|
/* is the largest currently supported. */
|
|
|
|
if (listen(ls, 5) == -1) {
|
|
m2log(fi,"Unable to listen on socket");
|
|
m2log(fi,"Terminating.");
|
|
exit(EXIT_FAILURE);
|
|
}
|
|
|
|
/* Now, all the initialization of the server is */
|
|
/* complete, and any user errors will have already */
|
|
/* been detected. Now we can fork the daemon and */
|
|
/* return to the user. We need to do a setpgrp */
|
|
/* so that the daemon will no longer be associated */
|
|
/* with the user's control terminal. This is done */
|
|
/* before the fork, so that the child will not be */
|
|
/* a process group leader. Otherwise, if the child */
|
|
/* were to open a terminal, it would become associated */
|
|
/* with that terminal as its control terminal. It is */
|
|
/* always best for the parent to do the setpgrp. */
|
|
|
|
m2log(fi,"Socket setup completed");
|
|
m2log(fi,"Start server");
|
|
|
|
setpgrp();
|
|
|
|
/* Initiate the tmspec struct for use with nanosleep() */
|
|
tmspec1.tv_sec = 0;
|
|
tmspec1.tv_nsec = 1;
|
|
|
|
printf("Waiting for client to connect.........\n");
|
|
printf("Done\n");
|
|
switch (fork()) {
|
|
case -1: /* Unable to fork, for some reason. */
|
|
m2log(fi,"Failed to start server");
|
|
m2log(fi,"Terminating.");
|
|
fclose(fi);
|
|
perror(argv[0]);
|
|
fprintf(stderr, "%s: unable to fork daemon\n", argv[0]);
|
|
exit(EXIT_FAILURE);
|
|
|
|
break;
|
|
case 0: /* The child process (daemon) comes here. */
|
|
m2log(fi,"Server started");
|
|
|
|
/* Close stdin and stderr so that they will not */
|
|
/* be kept open. Stdout is assumed to have been */
|
|
/* redirected to some logging file, or /dev/null. */
|
|
/* From now on, the daemon will not report any */
|
|
/* error messages. This daemon will loop forever, */
|
|
/* waiting for connections and forking a child */
|
|
/* server to handle each one. */
|
|
|
|
close((int)stdin);
|
|
close((int)stderr);
|
|
/* Set SIGCLD to SIG_IGN, in order to prevent */
|
|
/* the accumulation of zombies as each child */
|
|
/* terminates. This means the daemon does not */
|
|
/* have to make wait calls to clean them up. */
|
|
|
|
signal(SIGCLD, SIG_IGN);
|
|
for(EVER) {
|
|
if ((checkchangelog(fi,temp))==0)
|
|
m2log(fi,"Waiting for connection");
|
|
/* Note that addrlen is passed as a pointer */
|
|
/* so that the accept call can return the */
|
|
/* size of the returned address. */
|
|
|
|
addrlen = sizeof(struct sockaddr_in);
|
|
|
|
/* This call will block until a new */
|
|
/* connection arrives. Then, it will */
|
|
/* return the address of the connecting */
|
|
/* peer, and a new socket descriptor, s, */
|
|
/* for that connection. */
|
|
|
|
s = accept(ls,(struct sockaddr*) &peeraddr_in, &addrlen);
|
|
#ifdef MYDEBUG
|
|
puts("accepted");
|
|
#endif
|
|
if ((checkchangelog(fi,temp))==0)
|
|
m2log(fi,"Connection attempt from a client");
|
|
if ((checkchangelog(fi,temp))==0)
|
|
m2log(fi,"Start communication server");
|
|
|
|
if ( s == -1) exit(EXIT_FAILURE);
|
|
switch (fork()) {
|
|
case -1: /* Can't fork, just exit. */
|
|
if ((checkchangelog(fi,temp))==0)
|
|
m2log(fi,"Start communication server failed.");
|
|
exit(EXIT_FAILURE);
|
|
break;
|
|
case 0: /* Child process comes here. */
|
|
|
|
/* Get clients adress and save it in the info area */
|
|
/* Keep track of how many times the client connects to the server */
|
|
printf("Connect attempt from client %u\n",peeraddr_in.sin_addr.s_addr);
|
|
server(peeraddr_in.sin_addr.s_addr);
|
|
exit(EXIT_FAILURE);
|
|
break;
|
|
default: /* Daemon process comes here. */
|
|
/* The daemon needs to remember */
|
|
/* to close the new accept socket */
|
|
/* after forking the child. This */
|
|
/* prevents the daemon from running */
|
|
/* out of file descriptor space. It */
|
|
/* also means that when the server */
|
|
/* closes the socket, that it will */
|
|
/* allow the socket to be destroyed */
|
|
/* since it will be the last close. */
|
|
close(s);
|
|
break;
|
|
}
|
|
}
|
|
default: /* Parent process comes here. */
|
|
exit(EXIT_FAILURE);
|
|
}
|
|
return EXIT_SUCCESS;
|
|
}
|
|
|
|
/*----------------------------------------------------------------------
|
|
|
|
S E R V E R
|
|
* This is the actual server routine that the daemon forks to
|
|
handle each individual connection. Its purpose is to receive
|
|
the request packets from the remote client, process them,
|
|
and return the results to the client. It will also write some
|
|
logging information to stdout.
|
|
|
|
----------------------------------------------------------------------*/
|
|
|
|
server(long int servernum)
|
|
{
|
|
/******** NDB ***********/
|
|
Ndb MyNdb( "TEST_DB" );
|
|
int tTableId;
|
|
NdbConnection *MyTransaction;
|
|
NdbOperation *MyOperation;
|
|
int check;
|
|
int c1 = 0;
|
|
int c2 = 0;
|
|
int c3 = 0;
|
|
int c4 = 0;
|
|
int act_index = 0;
|
|
/************************/
|
|
register unsigned int reqcnt; /* keeps count of number of requests */
|
|
register unsigned int i; /* Loop counters */
|
|
register int x;
|
|
register short done; /* Loop variable */
|
|
short int found;
|
|
|
|
/* The server index number */
|
|
int thisServer;
|
|
|
|
/* Variables used to keep track of some statistics */
|
|
time_t ourtime;
|
|
time_t tmptime;
|
|
int tmpvalue;
|
|
long int tmptransfer;
|
|
long int transfer;
|
|
int ops = 0;
|
|
|
|
/* Variables used by the server */
|
|
char buf[400]; /* This example uses 10 byte messages. */
|
|
char *inet_ntoa();
|
|
char *hostname; /* points to the remote host's name string */
|
|
int len;
|
|
int rcvbuf_size;
|
|
|
|
long ctid;
|
|
|
|
unsigned char uc;
|
|
|
|
/* Variables used by the logging facilitiy */
|
|
char msg[600];
|
|
char crap[600];
|
|
char lognamn[600];
|
|
|
|
FILE *log;
|
|
|
|
/* scheduling parameter for pthread */
|
|
struct sched_param param1,param2,param3;
|
|
|
|
/* Header information */
|
|
/* cdrtype not used */
|
|
/*short cdrtype; */ /* 1 CDR Typ */
|
|
short cdrlen; /* 2 CDR recored length in bytes excluding CDR type */
|
|
short cdrsubtype; /* 1 CDR subtype */
|
|
unsigned int cdrid; /* 8 CDR unique number of each call */
|
|
unsigned int cdrtime; /* 4 CDR Time in seconds */
|
|
short cdrmillisec; /* 2 CDR Milliseconds */
|
|
short cdrstatus; /* 1 CDR For future use */
|
|
short cdrequipeid; /* 1 CDR Equipment id */
|
|
int cdrreserved1; /* 4 CDR For future use */
|
|
|
|
/* Defined or calculated for each record */
|
|
int cdrrestlen; /* Unprocessed data left in record in bytes */
|
|
|
|
/* Gemensamma datatyper */
|
|
unsigned short parmtype_prev; /* 1 Parameter type */
|
|
unsigned short parmtype; /* 1 Parameter type */
|
|
unsigned short parmlen; /* 1 Parameter type */
|
|
|
|
int rc; /* return code for functions */
|
|
|
|
/* Attribute object used with threads */
|
|
pthread_attr_t attr1;
|
|
pthread_attr_t attr2;
|
|
pthread_attr_t attr3;
|
|
struct cdr_record *tmpcdrptr,*ftest;
|
|
void *dat;
|
|
|
|
int error_from_client = 0;
|
|
|
|
/* Konstanter */
|
|
const int headerlen = 24; /* Length of header record */
|
|
|
|
parmtype_prev = 99;
|
|
reqcnt = 0;
|
|
|
|
/* Close the listen socket inherited from the daemon. */
|
|
close(ls);
|
|
|
|
printf("Use the readinfo program to get information about server status\n\n");
|
|
|
|
if((checkchangelog(fi,temp))==0)
|
|
c2log(fi,"Communication server started");
|
|
|
|
/* Look up the host information for the remote host */
|
|
/* that we have connected with. Its internet address */
|
|
/* was returned by the accept call, in the main */
|
|
/* daemon loop above. */
|
|
|
|
hp=gethostbyaddr((char *) &peeraddr_in.sin_addr,sizeof(struct in_addr),peeraddr_in.sin_family);
|
|
|
|
if (hp == NULL) {
|
|
/* The information is unavailable for the remote */
|
|
/* host. Just format its internet address to be */
|
|
/* printed out in the logging information. The */
|
|
/* address will be shown in "internet dot format". */
|
|
|
|
/*
|
|
hostname = inet_ntoa(peeraddr_in.sin_addr);
|
|
*/
|
|
sprintf(hostname,"Test");
|
|
logname(lognamn,"Cdrserver","Child",hostname);
|
|
}
|
|
else {
|
|
hostname = hp->h_name; /* point to host's name */
|
|
logname(lognamn,"Cdrserver","Child",hostname);
|
|
}
|
|
|
|
log=fopen(lognamn,"w");
|
|
if (log == NULL)
|
|
{
|
|
perror(hostname);
|
|
exit(EXIT_FAILURE);
|
|
}
|
|
n2log(log,"Setup in progress");
|
|
/* Log a startup message. */
|
|
|
|
/* The port number must be converted first to host byte */
|
|
/* order before printing. On most hosts, this is not */
|
|
/* necessary, but the ntohs() call is included here so */
|
|
/* that this program could easily be ported to a host */
|
|
/* that does require it. */
|
|
|
|
BaseString::snprintf(msg,sizeof(msg),"Startup from %s port %u",hostname,ntohs(peeraddr_in.sin_port));
|
|
if ((checkchangelog(fi,temp))==0)
|
|
c2log(fi,msg);
|
|
n2log(log,msg);
|
|
BaseString::snprintf(msg,sizeof(msg),"For further information, see log(%s)",lognamn);
|
|
if ((checkchangelog(fi,temp))==0)
|
|
c2log(fi,msg);
|
|
|
|
/* Set the socket for a lingering, graceful close. */
|
|
/* This will cause a final close of this socket to wait until */
|
|
/* all * data sent on it has been received by the remote host. */
|
|
|
|
linger.l_onoff =1;
|
|
linger.l_linger =0;
|
|
if (setsockopt(s, SOL_SOCKET, SO_LINGER,(const char*)&linger,sizeof(linger)) == -1) {
|
|
BaseString::snprintf(msg,sizeof(msg),"Setting SO_LINGER, l_onoff=%d, l_linger=%d",linger.l_onoff,linger.l_linger);
|
|
if ((checkchangelog(log,lognamn))==0)
|
|
n2log(log,msg);
|
|
goto errout;
|
|
}
|
|
|
|
/* Set the socket for a lingering, graceful close. */
|
|
/* This will cause a final close of this socket to wait until all * data sent */
|
|
/* on it has been received by the remote host. */
|
|
|
|
rcvbuf_size=64*1024;
|
|
|
|
if (setsockopt(s, SOL_SOCKET, SO_RCVBUF,(const char*) &rcvbuf_size,sizeof(rcvbuf_size)) == -1) {
|
|
BaseString::snprintf(msg,sizeof(msg),"Setting SO_RCVBUF = %d",rcvbuf_size);
|
|
if ((checkchangelog(log,lognamn))==0)
|
|
n2log(log,msg);
|
|
goto errout;
|
|
}
|
|
|
|
/* Set nodelay on socket */
|
|
n2log(log,"Port setup complete");
|
|
|
|
/* Go into a loop, receiving requests from the remote */
|
|
/* client. After the client has sent the last request, */
|
|
/* it will do a shutdown for sending, which will cause */
|
|
/* an end-of-file condition to appear on this end of the */
|
|
/* connection. After all of the client's requests have */
|
|
/* been received, the next recv call will return zero */
|
|
/* bytes, signalling an end-of-file condition. This is */
|
|
/* how the server will know that no more requests will */
|
|
/* follow, and the loop will be exited. */
|
|
|
|
n2log(log,"Setup completed");
|
|
|
|
/* Fetch the process id for the server */
|
|
|
|
/* Inititate the variables used for counting transfer rates and rec/sec */
|
|
tmpvalue = 0;
|
|
tmptime = 0;
|
|
tmptransfer = 0;
|
|
transfer = 0;
|
|
|
|
printf("Client %s connected\nStarting to process the data\n\n",hostname);
|
|
|
|
tmpcdrptr = (struct cdr_record*)malloc(sizeof(struct cdr_record));
|
|
|
|
/***** NDB ******/
|
|
MyNdb.init();
|
|
if (MyNdb.waitUntilReady(30) != 0)
|
|
{
|
|
puts("Not ready");
|
|
exit(-1);
|
|
}
|
|
tTableId = MyNdb.getTable()->openTable(tableName);
|
|
if (tTableId == -1)
|
|
{
|
|
printf("%d: Creating table",getpid());
|
|
create_table(&MyNdb);
|
|
}
|
|
else printf("%d: Table already created",getpid());
|
|
|
|
/****************/
|
|
|
|
while (len = recv(s,buf,headerlen,MSG_WAITALL)) {
|
|
if (len == -1) {
|
|
snprintf(msg,sizeof(msg),"Error from recv");
|
|
if ((checkchangelog(log,lognamn))==0)
|
|
n2log(log,msg);
|
|
goto errout; /* error from recv */
|
|
}
|
|
|
|
/* The reason this while loop exists is that there */
|
|
/* is a remote possibility of the above recv returning */
|
|
/* less than 10 bytes. This is because a recv returns */
|
|
/* as soon as there is some data, and will not wait for */
|
|
/* all of the requested data to arrive. Since 10 bytes */
|
|
/* is relatively small compared to the allowed TCP */
|
|
/* packet sizes, a partial receive is unlikely. If */
|
|
/* this example had used 2048 bytes requests instead, */
|
|
/* a partial receive would be far more likely. */
|
|
/* This loop will keep receiving until all 10 bytes */
|
|
/* have been received, thus guaranteeing that the */
|
|
/* next recv at the top of the loop will start at */
|
|
/* the begining of the next request. */
|
|
|
|
for (;len < headerlen;) {
|
|
x = recv(s,buf,(headerlen-len),0);
|
|
if (x == -1) {
|
|
snprintf(msg,sizeof(msg),"Error from recv");
|
|
if ((checkchangelog(log,lognamn))==0)
|
|
n2log(log,msg);
|
|
goto errout; /* error from recv */
|
|
}
|
|
len=len+x;
|
|
}
|
|
|
|
if (ops == 0) {
|
|
MyTransaction = MyNdb.startTransaction();
|
|
if (MyTransaction == NULL)
|
|
error_handler(MyNdb.getNdbErrorString());
|
|
}//if
|
|
|
|
MyOperation = MyTransaction->getNdbOperation(tableName);
|
|
if (MyOperation == NULL)
|
|
error_handler(MyTransaction->getNdbErrorString());
|
|
/*------------------------------------------------------*/
|
|
/* Parse header of CDR records */
|
|
/*------------------------------------------------------*/
|
|
|
|
/*------------------------------------------------------*/
|
|
/* 1. Type of cdr */
|
|
/*------------------------------------------------------*/
|
|
/* Not used for the moment
|
|
cdrtype=(char)buf[0];
|
|
*/
|
|
/*------------------------------------------------------*/
|
|
/* 2. Total length of CDR */
|
|
/*------------------------------------------------------*/
|
|
swab(buf+1,buf+1,2);
|
|
memcpy(&cdrlen,buf+1,2);
|
|
/*------------------------------------------------------*/
|
|
/* 3. Partial type of CDR */
|
|
/*------------------------------------------------------*/
|
|
cdrsubtype=(char)buf[3];
|
|
switch (cdrsubtype)
|
|
{
|
|
case 0:
|
|
c1++;
|
|
tmpcdrptr->CallAttemptState = 1;
|
|
check = MyOperation->insertTuple();
|
|
break;
|
|
case 1:
|
|
c2++;
|
|
tmpcdrptr->CallAttemptState = 2;
|
|
check = MyOperation->updateTuple();
|
|
break;
|
|
case 2:
|
|
c3++;
|
|
tmpcdrptr->CallAttemptState = 3;
|
|
check = MyOperation->deleteTuple();
|
|
break;
|
|
case 3:
|
|
c4++;
|
|
tmpcdrptr->CallAttemptState = 4;
|
|
check = MyOperation->deleteTuple();
|
|
break;
|
|
if (check == -1)
|
|
error_handler(MyTransaction->getNdbErrorString());
|
|
}
|
|
/*cdrsubtype=(cdrsubtype << 24) >> 24;*/
|
|
/*------------------------------------------------------*/
|
|
/* 4. ID number */
|
|
/*------------------------------------------------------*/
|
|
/*swab(buf+4,buf+4,4);*/ /* ABCD -> BADC */
|
|
/*
|
|
swab(buf+4,buf+4,4);
|
|
swab(buf+5,buf+5,2);
|
|
swab(buf+6,buf+6,2);
|
|
swab(buf+4,buf+4,2);
|
|
swab(buf+5,buf+5,2);
|
|
*/
|
|
memcpy(&cdrid,buf+4,4);
|
|
tmpcdrptr->CallIdentificationNumber = cdrid;
|
|
#ifdef SETDBG
|
|
puts("CIN");
|
|
#endif
|
|
check = MyOperation->equal("CIN",(char*)&cdrid);
|
|
if (check == -1)
|
|
error_handler(MyTransaction->getNdbErrorString());
|
|
#ifdef SETDBG
|
|
puts("CAS");
|
|
#endif
|
|
|
|
if (cdrsubtype < 2)
|
|
{
|
|
check = MyOperation->setValue("CAS",(char*)&cdrsubtype);
|
|
if (check == -1)
|
|
error_handler(MyTransaction->getNdbErrorString());
|
|
}
|
|
/*------------------------------------------------------*/
|
|
/* 5. Time stamp */
|
|
/*------------------------------------------------------*/
|
|
swab(buf+12,buf+12,4);
|
|
swab(buf+13,buf+13,2);
|
|
swab(buf+14,buf+14,2);
|
|
swab(buf+12,buf+12,2);
|
|
swab(buf+13,buf+13,2);
|
|
memcpy(&cdrtime,buf+12,4);
|
|
switch (cdrsubtype)
|
|
{
|
|
case 0:
|
|
#ifdef SETDBG
|
|
puts("START_TIME");
|
|
#endif
|
|
check = MyOperation->setValue("START_TIME",(char*)&cdrtime);
|
|
break;
|
|
case 1:
|
|
#ifdef SETDBG
|
|
puts("Start1");
|
|
#endif
|
|
check = MyOperation->setValue("StartOfCharge",(char*)&cdrtime);
|
|
break;
|
|
case 2:
|
|
#ifdef SETDBG
|
|
puts("Start2");
|
|
#endif
|
|
/*
|
|
check = MyOperation->setValue("StopOfCharge",(char*)&cdrtime);
|
|
*/
|
|
check = 0;
|
|
break;
|
|
if (check == -1)
|
|
error_handler(MyTransaction->getNdbErrorString());
|
|
}
|
|
/*------------------------------------------------------*/
|
|
/* 6. Milliseconds */
|
|
/*------------------------------------------------------*/
|
|
/* Not used by application
|
|
swab(buf+16,buf+16,2);
|
|
memcpy(&cdrmillisec,buf+16,2);
|
|
*/
|
|
/*------------------------------------------------------*/
|
|
/* 7. CDR status reserverd for future use */
|
|
/*------------------------------------------------------*/
|
|
/* Not used by application
|
|
memcpy(&cdrstatus,buf+18,1);
|
|
*/
|
|
/*------------------------------------------------------*/
|
|
/* 8. CDR equipe id, number of sending equipement */
|
|
/*------------------------------------------------------*/
|
|
/* Not used by application
|
|
memcpy(&cdrequipeid,buf+19,1);
|
|
*/
|
|
/*cdrequipeid=(cdrequipeid << 24) >> 24;*/
|
|
/*------------------------------------------------------*/
|
|
/* 9. CDR reserverd for furter use */
|
|
/*------------------------------------------------------*/
|
|
/* Not used by applikation
|
|
swab(buf+20,buf+20,4);
|
|
swab(buf+21,buf+21,2);
|
|
swab(buf+22,buf+22,2);
|
|
swab(buf+20,buf+20,2);
|
|
swab(buf+21,buf+21,2);
|
|
memcpy(&cdrreserved1,buf+20,4);
|
|
*/
|
|
/*------------------------------------------------------*/
|
|
/* calculate length of datapart in record */
|
|
/* Formula recordlength-headerlen-1 */
|
|
/*------------------------------------------------------*/
|
|
cdrrestlen=cdrlen-(headerlen-1);
|
|
/*------------------------------------------------------*/
|
|
/* Finished with header */
|
|
/*------------------------------------------------------*/
|
|
/* Read remaining cdr data into buffer for furter */
|
|
/* handling. */
|
|
/*------------------------------------------------------*/
|
|
len = recv(s,buf,cdrrestlen,MSG_WAITALL);
|
|
if (len == -1) {
|
|
snprintf(msg,sizeof(msg),"Error from recv");
|
|
if ((checkchangelog(log,lognamn))==0)
|
|
n2log(log,msg);
|
|
goto errout; /* error from recv */
|
|
}
|
|
for (;len<cdrrestlen;) {
|
|
x = recv(s,buf,len-cdrrestlen,0);
|
|
if (x == -1) {
|
|
snprintf(msg,sizeof(msg),"Error from recv");
|
|
if ((checkchangelog(log,lognamn))==0)
|
|
n2log(log,msg);
|
|
goto errout; /* error from recv */
|
|
}
|
|
len=len+x;
|
|
}
|
|
done=FALSE;
|
|
|
|
/* Count the transfer/sec */
|
|
tmptransfer += cdrlen;
|
|
if (cdrsubtype > 1)
|
|
{
|
|
#ifdef SETDBG
|
|
puts("Going to execute");
|
|
#endif
|
|
ops++;
|
|
if (ops == ops_before_exe) {
|
|
ops = 0;
|
|
check = MyTransaction->execute(Commit, CommitAsMuchAsPossible);
|
|
if ((check == -1) && (MyTransaction->getNdbError() != 0))
|
|
error_handler(MyTransaction->getNdbErrorString());
|
|
MyNdb.closeTransaction(MyTransaction);
|
|
#ifdef SETDBG
|
|
puts("Transaction closed");
|
|
#endif
|
|
}//if
|
|
reqcnt++;
|
|
continue;
|
|
}
|
|
for (x=0;x<=cdrrestlen && !done && cdrrestlen > 1;) {
|
|
uc=buf[x];
|
|
parmtype=uc;
|
|
/*parmtype=(parmtype << 24) >> 24;*/ /* Modified in sun worked in hp */
|
|
|
|
parmlen = buf[x+1];
|
|
/*parmlen =(parmlen << 24) >> 24;*/
|
|
x+=2;
|
|
|
|
switch (parmtype) {
|
|
case 4: /* Called party number */
|
|
bcd_decode2(parmlen,&buf[x],crap);
|
|
tmpcdrptr->BSubscriberNumberLength = (char)parmlen;
|
|
strcpy(tmpcdrptr->BSubscriberNumber,crap);
|
|
tmpcdrptr->BSubscriberNumber[parmlen] = '\0';
|
|
x=x+(parmlen/2);
|
|
if (parmlen % 2) x++;
|
|
tmpcdrptr->USED_FIELDS |= B_BSubscriberNumber;
|
|
#ifdef SETDBG
|
|
puts("BNumber");
|
|
#endif
|
|
check = MyOperation->setValue("BNumber",(char*)&tmpcdrptr->BSubscriberNumber);
|
|
if (check == -1)
|
|
error_handler(MyTransaction->getNdbErrorString());
|
|
break;
|
|
case 9: /* Calling Partys cataegory */
|
|
if (parmlen != 1) printf("ERROR: Calling partys category has wrong length %d\n",parmlen);
|
|
else tmpcdrptr->ACategory=(char)buf[x];
|
|
x+=parmlen;
|
|
tmpcdrptr->USED_FIELDS |= B_ACategory;
|
|
#ifdef SETDBG
|
|
puts("ACategory");
|
|
#endif
|
|
check = MyOperation->setValue("ACategory",(char*)&tmpcdrptr->ACategory);
|
|
if (check == -1)
|
|
error_handler(MyTransaction->getNdbErrorString());
|
|
break;
|
|
case 10: /* Calling Party Number */
|
|
bcd_decode2(parmlen,&buf[x],crap);
|
|
tmpcdrptr->ASubscriberNumberLength = (char)parmlen;
|
|
strcpy(tmpcdrptr->ASubscriberNumber,crap);
|
|
tmpcdrptr->ASubscriberNumber[parmlen] = '\0';
|
|
x=x+(parmlen/2);
|
|
if (parmlen % 2) x++;
|
|
tmpcdrptr->USED_FIELDS |= B_ASubscriberNumber;
|
|
#ifdef SETDBG
|
|
puts("ANumber");
|
|
#endif
|
|
check = MyOperation->setValue("ANumber",(char*)&tmpcdrptr->ASubscriberNumber);
|
|
if (check == -1)
|
|
error_handler(MyTransaction->getNdbErrorString());
|
|
break;
|
|
case 11: /* Redirecting number */
|
|
bcd_decode2(parmlen,&buf[x],crap);
|
|
strcpy(tmpcdrptr->RedirectingNumber,crap);
|
|
x=x+(parmlen/2);
|
|
if (parmlen % 2) x++;
|
|
tmpcdrptr->USED_FIELDS |= B_RedirectingNumber;
|
|
#ifdef SETDBG
|
|
puts("RNumber");
|
|
#endif
|
|
check = MyOperation->setValue("RNumber",(char*)&tmpcdrptr->RedirectingNumber);
|
|
if (check == -1)
|
|
error_handler(MyTransaction->getNdbErrorString());
|
|
break;
|
|
case 17: /* Called partys category */
|
|
if (parmlen != 1) printf("ERROR: Called partys category has wrong length %d\n",parmlen);
|
|
else tmpcdrptr->EndOfSelectionInformation=(char)buf[x];
|
|
x+=parmlen;
|
|
tmpcdrptr->USED_FIELDS |= B_EndOfSelectionInformation;
|
|
#ifdef SETDBG
|
|
puts("EndOfSelInf");
|
|
#endif
|
|
check = MyOperation->setValue("EndOfSelInf",(char*)&tmpcdrptr->EndOfSelectionInformation);
|
|
if (check == -1)
|
|
error_handler(MyTransaction->getNdbErrorString());
|
|
break;
|
|
case 18: /* Release reason */
|
|
if (parmlen != 1) printf("ERROR: Release reason has wrong length %d\n",parmlen);
|
|
else tmpcdrptr->CauseCode=(char)buf[x];
|
|
x+=parmlen;
|
|
tmpcdrptr->USED_FIELDS |= B_CauseCode;
|
|
#ifdef SETDBG
|
|
puts("CauseCode");
|
|
#endif
|
|
check = MyOperation->setValue("CauseCode",(char*)&tmpcdrptr->CauseCode);
|
|
if (check == -1)
|
|
error_handler(MyTransaction->getNdbErrorString());
|
|
break;
|
|
case 19: /* Redirection information */
|
|
switch (parmlen) {
|
|
case 1:
|
|
tmpcdrptr->ReroutingIndicator= (char)buf[x];
|
|
tmpcdrptr->USED_FIELDS |= B_ReroutingIndicator;
|
|
break;
|
|
case 2:
|
|
swab(buf+x,buf+x,2);
|
|
tmpcdrptr->ReroutingIndicator= buf[x];
|
|
tmpcdrptr->USED_FIELDS |= B_ReroutingIndicator;
|
|
break;
|
|
default :
|
|
BaseString::snprintf(msg,sizeof(msg),"ERROR: Redirection information has wrong length %d\n",parmlen);
|
|
if ((checkchangelog(log,lognamn))==0)
|
|
n2log(log,msg);
|
|
break;
|
|
#ifdef SETDBG
|
|
puts("RI");
|
|
#endif
|
|
check = MyOperation->setValue("RI",(char*)&tmpcdrptr->ReroutingIndicator);
|
|
if (check == -1)
|
|
error_handler(MyTransaction->getNdbErrorString());
|
|
}
|
|
x+=parmlen;
|
|
break;
|
|
case 32: /* User to user information */
|
|
if (parmlen != 1) printf("ERROR: User to User information has wrong length %d\n",parmlen);
|
|
else tmpcdrptr->UserToUserInformation=(char)buf[x];
|
|
x+=parmlen;
|
|
tmpcdrptr->USED_FIELDS |= B_UserToUserInformation;
|
|
#ifdef SETDBG
|
|
puts("UserToUserInf");
|
|
#endif
|
|
check = MyOperation->setValue("UserToUserInf",(char*)&tmpcdrptr->UserToUserInformation);
|
|
if (check == -1)
|
|
error_handler(MyTransaction->getNdbErrorString());
|
|
break;
|
|
case 40: /* Original called number */
|
|
bcd_decode2(parmlen,&buf[x],crap);
|
|
strcpy(tmpcdrptr->OriginalCalledNumber,crap);
|
|
x=x+(parmlen/2);
|
|
if (parmlen % 2) x++;
|
|
tmpcdrptr->USED_FIELDS |= B_OriginalCalledNumber;
|
|
#ifdef SETDBG
|
|
puts("ONumber");
|
|
#endif
|
|
check = MyOperation->setValue("ONumber",(char*)&tmpcdrptr->OriginalCalledNumber);
|
|
if (check == -1)
|
|
error_handler(MyTransaction->getNdbErrorString());
|
|
break;
|
|
case 42: /* User to user indicator */
|
|
if (parmlen != 1) printf("ERROR: User to User indicator has wrong length %d\n",parmlen);
|
|
else tmpcdrptr->UserToUserIndicatior=(char)buf[x];
|
|
x+=parmlen;
|
|
tmpcdrptr->USED_FIELDS |= B_UserToUserIndicatior;
|
|
#ifdef SETDBG
|
|
puts("UserToUserInd");
|
|
#endif
|
|
check = MyOperation->setValue("UserToUserInd",(char*)&tmpcdrptr->UserToUserIndicatior);
|
|
if (check == -1)
|
|
error_handler(MyTransaction->getNdbErrorString());
|
|
break;
|
|
case 63: /* Location number */
|
|
bcd_decode2(parmlen,&buf[x],crap);
|
|
strcpy(tmpcdrptr->LocationCode,crap);
|
|
x=x+(parmlen/2);
|
|
if (parmlen % 2) x++;
|
|
tmpcdrptr->USED_FIELDS |= B_LocationCode;
|
|
#ifdef SETDBG
|
|
puts("LocationCode");
|
|
#endif
|
|
check = MyOperation->setValue("LocationCode",(char*)&tmpcdrptr->LocationCode);
|
|
if (check == -1)
|
|
error_handler(MyTransaction->getNdbErrorString());
|
|
break;
|
|
case 240: /* Calling Partys cataegory */
|
|
if (parmlen != 1) printf("ERROR: Calling partys category has wrong length %d\n",parmlen);
|
|
else tmpcdrptr->NetworkIndicator=(char)buf[x];
|
|
x+=parmlen;
|
|
tmpcdrptr->USED_FIELDS |= B_NetworkIndicator;
|
|
#ifdef SETDBG
|
|
puts("NIndicator");
|
|
#endif
|
|
check = MyOperation->setValue("NIndicator",(char*)&tmpcdrptr->NetworkIndicator);
|
|
if (check == -1)
|
|
error_handler(MyTransaction->getNdbErrorString());
|
|
break;
|
|
case 241: /* Calling Partys cataegory */
|
|
if (parmlen != 1) printf("ERROR: Calling partys category has wrong length %d\n",parmlen);
|
|
else tmpcdrptr->TonASubscriberNumber=(char)buf[x];
|
|
x+=parmlen;
|
|
tmpcdrptr->USED_FIELDS |= B_TonASubscriberNumber;
|
|
#ifdef SETDBG
|
|
puts("TonANumber");
|
|
#endif
|
|
check = MyOperation->setValue("TonANumber",(char*)&tmpcdrptr->TonASubscriberNumber);
|
|
if (check == -1)
|
|
error_handler(MyTransaction->getNdbErrorString());
|
|
break;
|
|
case 242: /* Calling Partys cataegory */
|
|
if (parmlen != 1) printf("ERROR: Calling partys category has wrong length %d\n",parmlen);
|
|
else tmpcdrptr->TonBSubscriberNumber=(char)buf[x];
|
|
x+=parmlen;
|
|
tmpcdrptr->USED_FIELDS |= B_TonBSubscriberNumber;
|
|
#ifdef SETDBG
|
|
puts("TonBNumber");
|
|
#endif
|
|
check = MyOperation->setValue("TonBNumber",(char*)&tmpcdrptr->TonBSubscriberNumber);
|
|
if (check == -1)
|
|
error_handler(MyTransaction->getNdbErrorString());
|
|
break;
|
|
case 243: /* Calling Partys cataegory */
|
|
if (parmlen != 1) printf("ERROR: Calling partys category has wrong length %d\n",parmlen);
|
|
else tmpcdrptr->TonRedirectingNumber=(char)buf[x];
|
|
x+=parmlen;
|
|
tmpcdrptr->USED_FIELDS |= B_TonRedirectingNumber;
|
|
#ifdef SETDBG
|
|
puts("TonRNumber");
|
|
#endif
|
|
check = MyOperation->setValue("TonRNumber",(char*)&tmpcdrptr->TonRedirectingNumber);
|
|
if (check == -1)
|
|
error_handler(MyTransaction->getNdbErrorString());
|
|
break;
|
|
case 244: /* Calling Partys cataegory */
|
|
if (parmlen != 1) printf("ERROR: Calling partys category has wrong length %d\n",parmlen);
|
|
else tmpcdrptr->TonOriginalCalledNumber=(char)buf[x];
|
|
x+=parmlen;
|
|
tmpcdrptr->USED_FIELDS |= B_TonOriginalCalledNumber;
|
|
#ifdef SETDBG
|
|
puts("TonONumber");
|
|
#endif
|
|
check = MyOperation->setValue("TonONumber",(char*)&tmpcdrptr->TonOriginalCalledNumber);
|
|
if (check == -1)
|
|
error_handler(MyTransaction->getNdbErrorString());
|
|
break;
|
|
case 245: /* Calling Partys cataegory */
|
|
if (parmlen != 1) printf("ERROR: Calling partys category has wrong length %d\n",parmlen);
|
|
else tmpcdrptr->TonLocationCode=(char)buf[x];
|
|
x+=parmlen;
|
|
tmpcdrptr->USED_FIELDS |= B_TonLocationCode;
|
|
#ifdef SETDBG
|
|
puts("TonLocationCode");
|
|
#endif
|
|
check = MyOperation->setValue("TonLocationCode",(char*)&tmpcdrptr->TonLocationCode);
|
|
if (check == -1)
|
|
error_handler(MyTransaction->getNdbErrorString());
|
|
break;
|
|
case 252: /* RINParameter Parameter */
|
|
switch (parmlen) {
|
|
case 1:
|
|
tmpcdrptr->RINParameter=buf[x];
|
|
tmpcdrptr->USED_FIELDS |= B_RINParameter;
|
|
break;
|
|
case 2:
|
|
swab(buf+x,buf+x,2);
|
|
tmpcdrptr->RINParameter = buf[x] << 8;
|
|
tmpcdrptr->USED_FIELDS |= B_RINParameter;
|
|
break;
|
|
default :
|
|
BaseString::snprintf(msg,sizeof(msg),"ERROR: Rin parameter has wrong length %d\n",parmlen);
|
|
if ((checkchangelog(log,lognamn))==0)
|
|
n2log(log,msg);
|
|
break;
|
|
}
|
|
x+=parmlen;
|
|
#ifdef SETDBG
|
|
puts("RINParameter");
|
|
#endif
|
|
check = MyOperation->setValue("RINParameter",(char*)&tmpcdrptr->RINParameter);
|
|
if (check == -1)
|
|
error_handler(MyTransaction->getNdbErrorString());
|
|
break;
|
|
case 253: /* OriginatingPointCode */
|
|
switch (parmlen) {
|
|
case 2:
|
|
swab(buf+x,buf+x,2);
|
|
memcpy(&tmpcdrptr->OriginatingPointCode,(buf+x),2);
|
|
tmpcdrptr->USED_FIELDS |= B_OriginatingPointCode;
|
|
break;
|
|
case 3:
|
|
swab(buf+x,buf+x,2);
|
|
swab(buf+(x+1),buf+(x+1),2);
|
|
swab(buf+x,buf+x,2);
|
|
memcpy(&tmpcdrptr->OriginatingPointCode,(buf+x),3);
|
|
tmpcdrptr->USED_FIELDS |= B_OriginatingPointCode;
|
|
break;
|
|
default :
|
|
BaseString::snprintf(msg,sizeof(msg),"ERROR: OriginatingPointCode parameter has wrong length %d\n",parmlen);
|
|
if ((checkchangelog(log,lognamn))==0)
|
|
n2log(log,msg);
|
|
break;
|
|
}
|
|
x+=parmlen;
|
|
#ifdef SETDBG
|
|
puts("OPC");
|
|
#endif
|
|
check = MyOperation->setValue("OPC",(char*)&tmpcdrptr->OriginatingPointCode);
|
|
if (check == -1)
|
|
error_handler(MyTransaction->getNdbErrorString());
|
|
break;
|
|
case 254: /* DestinationPointCode */
|
|
switch (parmlen) {
|
|
case 2:
|
|
swab(buf+x,buf+x,2);
|
|
memcpy(&tmpcdrptr->DestinationPointCode,(buf+x),2);
|
|
/*
|
|
tmpcdrptr->DestinationPointCode = buf[x] << 8;
|
|
*/
|
|
tmpcdrptr->USED_FIELDS |= B_DestinationPointCode;
|
|
break;
|
|
case 3:
|
|
swab(buf+x,buf+x,2);
|
|
swab(buf+(x+1),buf+(x+1),2);
|
|
swab(buf+x,buf+x,2);
|
|
memcpy(&tmpcdrptr->DestinationPointCode,(buf+x),3);
|
|
tmpcdrptr->USED_FIELDS |= B_DestinationPointCode;
|
|
break;
|
|
default :
|
|
BaseString::snprintf(msg,sizeof(msg),"ERROR: DestinationPointCode parameter has wrong length %d\n",parmlen);
|
|
if ((checkchangelog(log,lognamn))==0)
|
|
n2log(log,msg);
|
|
break;
|
|
}
|
|
x+=parmlen;
|
|
#ifdef SETDBG
|
|
puts("DPC");
|
|
#endif
|
|
check = MyOperation->setValue("DPC",(char*)&tmpcdrptr->DestinationPointCode);
|
|
if (check == -1)
|
|
error_handler(MyTransaction->getNdbErrorString());
|
|
break;
|
|
case 255: /* CircuitIdentificationCode */
|
|
swab(buf+x,buf+x,2);
|
|
memcpy(&tmpcdrptr->CircuitIdentificationCode,(buf+x),2);
|
|
tmpcdrptr->USED_FIELDS |= B_CircuitIdentificationCode;
|
|
x+=parmlen;
|
|
#ifdef SETDBG
|
|
puts("CIC");
|
|
#endif
|
|
check = MyOperation->setValue("CIC",(char*)&tmpcdrptr->CircuitIdentificationCode);
|
|
if (check == -1)
|
|
error_handler(MyTransaction->getNdbErrorString());
|
|
break;
|
|
default:
|
|
printf("ERROR: Undefined parmtype %d , previous %d, length %d\n",parmtype,parmtype_prev,parmlen);
|
|
BaseString::snprintf(msg,sizeof(msg),"ERROR: Undefined parmtype %d , previous %d, length %d\n",parmtype,parmtype_prev,parmlen);
|
|
if ((checkchangelog(log,lognamn))==0)
|
|
n2log(log,msg);
|
|
if (parmlen == 0) {
|
|
x++;
|
|
}
|
|
x+=parmlen;
|
|
break;
|
|
}
|
|
parmtype_prev=parmtype;
|
|
if ((cdrrestlen-x) == 1) {
|
|
done=TRUE;
|
|
}
|
|
}
|
|
time(&ourtime);
|
|
if (ourtime != tmptime)
|
|
{
|
|
transfer = tmptransfer;
|
|
tmptransfer = 0;
|
|
if (++act_index == 30)
|
|
{
|
|
act_index = 0;
|
|
printf("Transfer=%d\n",transfer);
|
|
printf("Total operations=%d\n",reqcnt);
|
|
printf("CAS1=%d\n",c1/30);
|
|
printf("CAS2=%d\n",c2/30);
|
|
printf("CAS3=%d\n",c3/30);
|
|
c1=0;
|
|
c2=0;
|
|
c3=0;
|
|
}
|
|
tmptime = ourtime;
|
|
}
|
|
switch (cdrsubtype) {
|
|
case 0:
|
|
tmpcdrptr->ClientId = servernum;
|
|
#ifdef SETDBG
|
|
puts("ClientId");
|
|
#endif
|
|
check = MyOperation->setValue("ClientId",(char*)&tmpcdrptr->ClientId);
|
|
if (check == -1)
|
|
error_handler(MyTransaction->getNdbErrorString());
|
|
tmpcdrptr->OurSTART_TIME = ourtime;
|
|
#ifdef SETDBG
|
|
puts("OurSTART_TIME");
|
|
#endif
|
|
check = MyOperation->setValue("OurSTART_TIME",(char*)&tmpcdrptr->OurSTART_TIME);
|
|
if (check == -1)
|
|
error_handler(MyTransaction->getNdbErrorString());
|
|
tmpcdrptr->USED_FIELDS |= B_START_TIME;
|
|
#ifdef SETDBG
|
|
puts("USED_FIELDS");
|
|
#endif
|
|
check = MyOperation->setValue("USED_FIELDS",(char*)&tmpcdrptr->USED_FIELDS);
|
|
if (check == -1)
|
|
error_handler(MyTransaction->getNdbErrorString());
|
|
break;
|
|
|
|
case 1:
|
|
tmpcdrptr->OurTimeForStartOfCharge = ourtime;
|
|
#ifdef SETDBG
|
|
puts("OurStartOfCharge");
|
|
#endif
|
|
check = MyOperation->setValue("OurStartOfCharge",(char*)&tmpcdrptr->OurTimeForStartOfCharge);
|
|
if (check == -1)
|
|
error_handler(MyTransaction->getNdbErrorString());
|
|
tmpcdrptr->USED_FIELDS |= B_TimeForStartOfCharge;
|
|
#ifdef SETDBG
|
|
puts("USED_FIELDS");
|
|
#endif
|
|
check = MyOperation->setValue("USED_FIELDS",(char*)&tmpcdrptr->USED_FIELDS);
|
|
if (check == -1)
|
|
error_handler(MyTransaction->getNdbErrorString());
|
|
break;
|
|
|
|
case 2:
|
|
tmpcdrptr->OurTimeForStopOfCharge = ourtime;
|
|
#ifdef SETDBG
|
|
puts("OurStopOfCharge");
|
|
#endif
|
|
check = MyOperation->setValue("OurStopOfCharge",(char*)&tmpcdrptr->OurTimeForStopOfCharge);
|
|
if (check == -1)
|
|
error_handler(MyTransaction->getNdbErrorString());
|
|
tmpcdrptr->USED_FIELDS |= B_TimeForStopOfCharge;
|
|
#ifdef SETDBG
|
|
puts("USED_FIELDS");
|
|
#endif
|
|
check = MyOperation->setValue("USED_FIELDS",(char*)&tmpcdrptr->USED_FIELDS);
|
|
if (check == -1)
|
|
error_handler(MyTransaction->getNdbErrorString());
|
|
break;
|
|
|
|
case 3:
|
|
tmpcdrptr->CallAttemptState = 4;
|
|
break;
|
|
default:
|
|
snprintf(msg,sizeof(msg),"cdrtype %d unknown",cdrsubtype);
|
|
if ((checkchangelog(log,lognamn))==0)
|
|
n2log(log,msg);
|
|
goto errout;
|
|
break;
|
|
}
|
|
ops++;
|
|
if (ops == ops_before_exe) {
|
|
ops = 0;
|
|
#ifdef SETDBG
|
|
puts("Going to execute");
|
|
#endif
|
|
check = MyTransaction->execute(Commit, CommitAsMuchAsPossible);
|
|
if ((check == -1) && (MyTransaction->getNdbError() != 0))
|
|
error_handler(MyTransaction->getNdbErrorString());
|
|
MyNdb.closeTransaction(MyTransaction);
|
|
#ifdef SETDBG
|
|
puts("Transaction closed");
|
|
#endif
|
|
|
|
#ifdef SETDBG
|
|
puts("New transaction initiated");
|
|
#endif
|
|
}//if
|
|
/* Increment the request count. */
|
|
reqcnt++;
|
|
|
|
/* Send a response back to the client. */
|
|
|
|
/* if (send(s, buf, 10, 0) != 10) goto errout; */
|
|
}
|
|
|
|
/* The loop has terminated, because there are no */
|
|
/* more requests to be serviced. As mentioned above, */
|
|
/* this close will block until all of the sent replies */
|
|
/* have been received by the remote host. The reason */
|
|
/* for lingering on the close is so that the server will */
|
|
/* have a better idea of when the remote has picked up */
|
|
/* all of the data. This will allow the start and finish */
|
|
/* times printed in the log file to reflect more accurately */
|
|
/* the length of time this connection was */
|
|
/* The port number must be converted first to host byte */
|
|
/* order before printing. On most hosts, this is not */
|
|
/* necessary, but the ntohs() call is included here so */
|
|
/* that this program could easily be ported to a host */
|
|
/* that does require it. */
|
|
|
|
BaseString::snprintf(msg,sizeof(msg),"Completed %s port %u, %d requests",hostname,ntohs(peeraddr_in.sin_port), reqcnt);
|
|
if ((checkchangelog(fi,temp))==0)
|
|
c2log(fi,msg);
|
|
error_from_client = 1;
|
|
BaseString::snprintf(msg,sizeof(msg),"Communicate with threads");
|
|
if ((checkchangelog(log,lognamn))==0)
|
|
n2log(log,msg);
|
|
BaseString::snprintf(msg,sizeof(msg),"Waiting for threads to return from work");
|
|
if ((checkchangelog(log,lognamn))==0)
|
|
n2log(log,msg);
|
|
BaseString::snprintf(msg,sizeof(msg),"Closing down");
|
|
if ((checkchangelog(log,lognamn))==0)
|
|
n2log(log,msg);
|
|
close(s);
|
|
fclose(log);
|
|
return EXIT_SUCCESS;
|
|
|
|
errout:
|
|
BaseString::snprintf(msg,sizeof(msg),"Connection with %s aborted on error\n", hostname);
|
|
if ((checkchangelog(log,lognamn))==0)
|
|
n2log(log,msg);
|
|
if ((checkchangelog(fi,temp))==0)
|
|
c2log(fi,msg);
|
|
error_from_client = 1;
|
|
BaseString::snprintf(msg,sizeof(msg),"Communicate with threads");
|
|
if ((checkchangelog(log,lognamn))==0)
|
|
n2log(log,msg);
|
|
BaseString::snprintf(msg,sizeof(msg),"Waiting for threads to return from work");
|
|
if ((checkchangelog(log,lognamn))==0)
|
|
n2log(log,msg);
|
|
BaseString::snprintf(msg,sizeof(msg),"Closing down");
|
|
if ((checkchangelog(log,lognamn))==0)
|
|
n2log(log,msg);
|
|
close(s);
|
|
fclose(log);
|
|
return EXIT_FAILURE;
|
|
}
|
|
|
|
void
|
|
create_table(Ndb* pMyNdb)
|
|
{
|
|
|
|
/****************************************************************
|
|
* Create table and attributes.
|
|
*
|
|
* create table basictab1(
|
|
* col1 int,
|
|
* col2 int not null,
|
|
* col3 int not null,
|
|
* col4 int not null
|
|
* )
|
|
*
|
|
***************************************************************/
|
|
|
|
int check;
|
|
int i;
|
|
NdbSchemaCon *MySchemaTransaction;
|
|
NdbSchemaOp *MySchemaOp;
|
|
int tAttributeSize;
|
|
|
|
tAttributeSize = 1;
|
|
|
|
cout << "Creating " << tableName << "..." << endl;
|
|
|
|
MySchemaTransaction = pMyNdb->startSchemaTransaction();
|
|
if( MySchemaTransaction == NULL )
|
|
error_handler(MySchemaTransaction->getNdbErrorString());
|
|
|
|
MySchemaOp = MySchemaTransaction->getNdbSchemaOp();
|
|
if( MySchemaOp == NULL )
|
|
error_handler(MySchemaTransaction->getNdbErrorString());
|
|
|
|
// Createtable
|
|
check = MySchemaOp->createTable( tableName,
|
|
8, // Table Size
|
|
TupleKey, // Key Type
|
|
40 // Nr of Pages
|
|
);
|
|
if( check == -1 )
|
|
error_handler(MySchemaTransaction->getNdbErrorString());
|
|
|
|
// CallIdentificationNumber Create first column, primary key
|
|
check = MySchemaOp->createAttribute( "CIN",
|
|
TupleKey,
|
|
32,
|
|
tAttributeSize,
|
|
UnSigned, MMBased,
|
|
NotNullAttribute
|
|
);
|
|
if( check == -1 )
|
|
error_handler(MySchemaTransaction->getNdbErrorString());
|
|
|
|
|
|
// USED_FIELDS Create attributes
|
|
check = MySchemaOp->createAttribute( "USED_FIELDS", NoKey, 32,
|
|
tAttributeSize, UnSigned, MMBased,
|
|
NullAttribute );
|
|
if( check == -1 )
|
|
error_handler(MySchemaTransaction->getNdbErrorString());
|
|
|
|
// ClientId Create attributes
|
|
check = MySchemaOp->createAttribute( "ClientId", NoKey, 32,
|
|
tAttributeSize, UnSigned, MMBased,
|
|
NullAttribute );
|
|
if( check == -1 )
|
|
error_handler(MySchemaTransaction->getNdbErrorString());
|
|
|
|
// START_TIME Create attributes
|
|
check = MySchemaOp->createAttribute( "START_TIME", NoKey, 32,
|
|
tAttributeSize, UnSigned, MMBased,
|
|
NullAttribute );
|
|
if( check == -1 )
|
|
error_handler(MySchemaTransaction->getNdbErrorString());
|
|
|
|
// OurSTART_TIME Create attributes
|
|
check = MySchemaOp->createAttribute( "OurSTART_TIME", NoKey, 32,
|
|
tAttributeSize, UnSigned, MMBased,
|
|
NullAttribute );
|
|
if( check == -1 )
|
|
error_handler(MySchemaTransaction->getNdbErrorString());
|
|
|
|
// TimeForStartOfCharge Create attributes
|
|
check = MySchemaOp->createAttribute( "StartOfCharge", NoKey, 32,
|
|
tAttributeSize, UnSigned, MMBased,
|
|
NullAttribute );
|
|
if( check == -1 )
|
|
error_handler(MySchemaTransaction->getNdbErrorString());
|
|
|
|
// TimeForStopOfCharge Create attributes
|
|
check = MySchemaOp->createAttribute( "StopOfCharge", NoKey, 32,
|
|
tAttributeSize, UnSigned, MMBased,
|
|
NullAttribute );
|
|
if( check == -1 )
|
|
error_handler(MySchemaTransaction->getNdbErrorString());
|
|
|
|
// OurTimeForStartOfCharge Create attributes
|
|
check = MySchemaOp->createAttribute( "OurStartOfCharge", NoKey, 32,
|
|
tAttributeSize, UnSigned, MMBased,
|
|
NullAttribute );
|
|
if( check == -1 )
|
|
error_handler(MySchemaTransaction->getNdbErrorString());
|
|
|
|
// OurTimeForStopOfCharge Create attributes
|
|
check = MySchemaOp->createAttribute( "OurStopOfCharge", NoKey, 32,
|
|
tAttributeSize, UnSigned, MMBased,
|
|
NullAttribute );
|
|
if( check == -1 )
|
|
error_handler(MySchemaTransaction->getNdbErrorString());
|
|
|
|
// DestinationPointCode Create attributes
|
|
check = MySchemaOp->createAttribute( "DPC", NoKey, 16,
|
|
tAttributeSize, UnSigned, MMBased,
|
|
NullAttribute );
|
|
if( check == -1 )
|
|
error_handler(MySchemaTransaction->getNdbErrorString());
|
|
|
|
// OriginatingPointCode Create attributes
|
|
check = MySchemaOp->createAttribute( "OPC", NoKey, 16,
|
|
tAttributeSize, UnSigned, MMBased,
|
|
NullAttribute );
|
|
if( check == -1 )
|
|
error_handler(MySchemaTransaction->getNdbErrorString());
|
|
|
|
// CircuitIdentificationCode Create attributes
|
|
check = MySchemaOp->createAttribute( "CIC", NoKey, 16,
|
|
tAttributeSize, UnSigned, MMBased,
|
|
NullAttribute );
|
|
if( check == -1 )
|
|
error_handler(MySchemaTransaction->getNdbErrorString());
|
|
|
|
// ReroutingIndicator Create attributes
|
|
check = MySchemaOp->createAttribute( "RI", NoKey, 16,
|
|
tAttributeSize, UnSigned, MMBased,
|
|
NullAttribute );
|
|
if( check == -1 )
|
|
error_handler(MySchemaTransaction->getNdbErrorString());
|
|
|
|
// RINParameter Create attributes
|
|
check = MySchemaOp->createAttribute( "RINParameter", NoKey, 16,
|
|
tAttributeSize, UnSigned, MMBased,
|
|
NullAttribute );
|
|
if( check == -1 )
|
|
error_handler(MySchemaTransaction->getNdbErrorString());
|
|
|
|
// NetworkIndicator Create attributes
|
|
check = MySchemaOp->createAttribute( "NIndicator", NoKey, 8,
|
|
tAttributeSize, Signed, MMBased,
|
|
NullAttribute );
|
|
if( check == -1 )
|
|
error_handler(MySchemaTransaction->getNdbErrorString());
|
|
|
|
// CallAttemptState Create attributes
|
|
check = MySchemaOp->createAttribute( "CAS", NoKey, 8,
|
|
tAttributeSize, Signed, MMBased,
|
|
NullAttribute );
|
|
if( check == -1 )
|
|
error_handler(MySchemaTransaction->getNdbErrorString());
|
|
|
|
// ACategory Create attributes
|
|
check = MySchemaOp->createAttribute( "ACategory", NoKey, 8,
|
|
tAttributeSize, Signed, MMBased,
|
|
NullAttribute );
|
|
if( check == -1 )
|
|
error_handler(MySchemaTransaction->getNdbErrorString());
|
|
|
|
// EndOfSelectionInformation Create attributes
|
|
check = MySchemaOp->createAttribute( "EndOfSelInf", NoKey, 8,
|
|
tAttributeSize, Signed, MMBased,
|
|
NullAttribute );
|
|
if( check == -1 )
|
|
error_handler(MySchemaTransaction->getNdbErrorString());
|
|
|
|
// UserToUserInformation Create attributes
|
|
check = MySchemaOp->createAttribute( "UserToUserInf", NoKey, 8,
|
|
tAttributeSize, Signed, MMBased,
|
|
NullAttribute );
|
|
if( check == -1 )
|
|
error_handler(MySchemaTransaction->getNdbErrorString());
|
|
|
|
// UserToUserIndicator Create attributes
|
|
check = MySchemaOp->createAttribute( "UserToUserInd", NoKey, 8,
|
|
tAttributeSize, Signed, MMBased,
|
|
NullAttribute );
|
|
if( check == -1 )
|
|
error_handler(MySchemaTransaction->getNdbErrorString());
|
|
|
|
// CauseCode Create attributes
|
|
check = MySchemaOp->createAttribute( "CauseCode", NoKey, 8,
|
|
tAttributeSize, Signed, MMBased,
|
|
NullAttribute );
|
|
if( check == -1 )
|
|
error_handler(MySchemaTransaction->getNdbErrorString());
|
|
|
|
// ASubscriberNumber attributes
|
|
check = MySchemaOp->createAttribute( "ANumber", NoKey, 8,
|
|
ASubscriberNumber_SIZE, Signed, MMBased,
|
|
NullAttribute );
|
|
if( check == -1 )
|
|
error_handler(MySchemaTransaction->getNdbErrorString());
|
|
|
|
// ASubscriberNumberLenght attributes
|
|
check = MySchemaOp->createAttribute( "ANumberLength", NoKey, 8,
|
|
tAttributeSize, Signed, MMBased,
|
|
NullAttribute );
|
|
if( check == -1 )
|
|
error_handler(MySchemaTransaction->getNdbErrorString());
|
|
|
|
// TonASubscriberNumber attributes
|
|
check = MySchemaOp->createAttribute( "TonANumber", NoKey, 8,
|
|
tAttributeSize, Signed, MMBased,
|
|
NullAttribute );
|
|
if( check == -1 )
|
|
error_handler(MySchemaTransaction->getNdbErrorString());
|
|
|
|
// BSubscriberNumber attributes
|
|
check = MySchemaOp->createAttribute( "BNumber", NoKey, 8,
|
|
BSubscriberNumber_SIZE, Signed, MMBased,
|
|
NullAttribute );
|
|
if( check == -1 )
|
|
error_handler(MySchemaTransaction->getNdbErrorString());
|
|
|
|
// BSubscriberNumberLength attributes
|
|
check = MySchemaOp->createAttribute( "BNumberLength", NoKey, 8,
|
|
tAttributeSize, Signed, MMBased,
|
|
NullAttribute );
|
|
if( check == -1 )
|
|
error_handler(MySchemaTransaction->getNdbErrorString());
|
|
|
|
// TonBSubscriberNumber attributes
|
|
check = MySchemaOp->createAttribute( "TonBNumber", NoKey, 8,
|
|
tAttributeSize, Signed, MMBased,
|
|
NullAttribute );
|
|
if( check == -1 )
|
|
error_handler(MySchemaTransaction->getNdbErrorString());
|
|
|
|
// RedirectingNumber attributes
|
|
check = MySchemaOp->createAttribute( "RNumber", NoKey, 8,
|
|
ASubscriberNumber_SIZE, Signed, MMBased,
|
|
NullAttribute );
|
|
if( check == -1 )
|
|
error_handler(MySchemaTransaction->getNdbErrorString());
|
|
|
|
// TonRedirectingNumber attributes
|
|
check = MySchemaOp->createAttribute( "TonRNumber", NoKey, 8,
|
|
tAttributeSize, Signed, MMBased,
|
|
NullAttribute );
|
|
if( check == -1 )
|
|
error_handler(MySchemaTransaction->getNdbErrorString());
|
|
|
|
// OriginalCalledNumber attributes
|
|
check = MySchemaOp->createAttribute( "ONumber", NoKey, 8,
|
|
ASubscriberNumber_SIZE, Signed, MMBased,
|
|
NullAttribute );
|
|
if( check == -1 )
|
|
error_handler(MySchemaTransaction->getNdbErrorString());
|
|
|
|
// TonOriginalCalledNumber attributes
|
|
check = MySchemaOp->createAttribute( "TonONumber", NoKey, 8,
|
|
tAttributeSize, Signed, MMBased,
|
|
NullAttribute );
|
|
if( check == -1 )
|
|
error_handler(MySchemaTransaction->getNdbErrorString());
|
|
|
|
// LocationCode attributes
|
|
check = MySchemaOp->createAttribute( "LocationCode", NoKey, 8,
|
|
ASubscriberNumber_SIZE, Signed, MMBased,
|
|
NullAttribute );
|
|
if( check == -1 )
|
|
error_handler(MySchemaTransaction->getNdbErrorString());
|
|
|
|
// TonLocationCode attributes
|
|
check = MySchemaOp->createAttribute( "TonLocationCode", NoKey, 8,
|
|
tAttributeSize, Signed, MMBased,
|
|
NullAttribute );
|
|
if( check == -1 )
|
|
error_handler(MySchemaTransaction->getNdbErrorString());
|
|
|
|
if( MySchemaTransaction->execute() == -1 ) {
|
|
cout << tableName << " already exist" << endl;
|
|
cout << "Message: " << MySchemaTransaction->getNdbErrorString() << endl;
|
|
}
|
|
else
|
|
{
|
|
cout << tableName << " created" << endl;
|
|
}
|
|
pMyNdb->closeSchemaTransaction(MySchemaTransaction);
|
|
|
|
return;
|
|
}
|
|
|
|
void
|
|
error_handler(const char* errorText)
|
|
{
|
|
// Test failed
|
|
cout << endl << "ErrorMessage: " << errorText << endl;
|
|
bTestPassed = -1;
|
|
}
|