mirror of
https://github.com/MariaDB/server.git
synced 2025-02-02 03:51:50 +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
1482 lines
48 KiB
C++
1482 lines
48 KiB
C++
/* Copyright (C) 2000-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 */
|
|
|
|
/* This is the include file that should be included 'first' in every C file. */
|
|
|
|
#ifndef _global_h
|
|
#define _global_h
|
|
|
|
#ifndef EMBEDDED_LIBRARY
|
|
#define HAVE_REPLICATION
|
|
#define HAVE_EXTERNAL_CLIENT
|
|
#endif
|
|
|
|
#ifdef __CYGWIN__
|
|
/* We use a Unix API, so pretend it's not Windows */
|
|
#undef WIN
|
|
#undef WIN32
|
|
#undef _WIN
|
|
#undef _WIN32
|
|
#undef _WIN64
|
|
#undef __WIN__
|
|
#undef __WIN32__
|
|
#define HAVE_ERRNO_AS_DEFINE
|
|
#endif /* __CYGWIN__ */
|
|
|
|
#if defined(__QNXNTO__) && !defined(FD_SETSIZE)
|
|
#define FD_SETSIZE 1024 /* Max number of file descriptor bits in
|
|
fd_set, used when calling 'select'
|
|
Must be defined before including
|
|
"sys/select.h" and "sys/time.h"
|
|
*/
|
|
#endif
|
|
|
|
|
|
/* to make command line shorter we'll define USE_PRAGMA_INTERFACE here */
|
|
#ifdef USE_PRAGMA_IMPLEMENTATION
|
|
#define USE_PRAGMA_INTERFACE
|
|
#endif
|
|
|
|
#if defined(i386) && !defined(__i386__)
|
|
#define __i386__
|
|
#endif
|
|
|
|
/* Macros to make switching between C and C++ mode easier */
|
|
#ifdef __cplusplus
|
|
#define C_MODE_START extern "C" {
|
|
#define C_MODE_END }
|
|
#else
|
|
#define C_MODE_START
|
|
#define C_MODE_END
|
|
#endif
|
|
|
|
#if defined(_WIN32) || defined(_WIN64) || defined(__WIN32__) || defined(WIN32)
|
|
#include <config-win.h>
|
|
#elif defined(__NETWARE__)
|
|
#include <my_config.h>
|
|
#include <config-netware.h>
|
|
#if defined(__cplusplus) && defined(inline)
|
|
#undef inline /* fix configure problem */
|
|
#endif
|
|
#else
|
|
#include <my_config.h>
|
|
#if defined(__cplusplus) && defined(inline)
|
|
#undef inline /* fix configure problem */
|
|
#endif
|
|
#endif /* _WIN32... */
|
|
|
|
#ifndef EMBEDDED_LIBRARY
|
|
#ifdef WITH_ROW_BASED_REPLICATION
|
|
#define HAVE_ROW_BASED_REPLICATION 1
|
|
#endif
|
|
#ifdef WITH_NDB_BINLOG
|
|
#define HAVE_NDB_BINLOG 1
|
|
#endif
|
|
#endif /* !EMBEDDED_LIBRARY */
|
|
|
|
/* Some defines to avoid ifdefs in the code */
|
|
#ifndef NETWARE_YIELD
|
|
#define NETWARE_YIELD
|
|
#define NETWARE_SET_SCREEN_MODE(A)
|
|
#endif
|
|
|
|
/*
|
|
The macros below are borrowed from include/linux/compiler.h in the
|
|
Linux kernel. Use them to indicate the likelyhood of the truthfulness
|
|
of a condition. This serves two purposes - newer versions of gcc will be
|
|
able to optimize for branch predication, which could yield siginficant
|
|
performance gains in frequently executed sections of the code, and the
|
|
other reason to use them is for documentation
|
|
*/
|
|
|
|
#if !defined(__GNUC__) || (__GNUC__ == 2 && __GNUC_MINOR__ < 96)
|
|
#define __builtin_expect(x, expected_value) (x)
|
|
#endif
|
|
|
|
#define likely(x) __builtin_expect((x),1)
|
|
#define unlikely(x) __builtin_expect((x),0)
|
|
|
|
|
|
/*
|
|
The macros below are useful in optimising places where it has been
|
|
discovered that cache misses stall the process and where a prefetch
|
|
of the cache line can improve matters. This is available in GCC 3.1.1
|
|
and later versions.
|
|
PREFETCH_READ says that addr is going to be used for reading and that
|
|
it is to be kept in caches if possible for a while
|
|
PREFETCH_WRITE also says that the item to be cached is likely to be
|
|
updated.
|
|
The *LOCALITY scripts are also available for experimentation purposes
|
|
mostly and should only be used if they are verified to improve matters.
|
|
For more input see GCC manual (available in GCC 3.1.1 and later)
|
|
*/
|
|
|
|
#if (__GNUC__ > 3) || (__GNUC__ == 3 && __GNUC_MINOR > 10)
|
|
#define PREFETCH_READ(addr) __builtin_prefetch(addr, 0, 3)
|
|
#define PREFETCH_WRITE(addr) \
|
|
__builtin_prefetch(addr, 1, 3)
|
|
#define PREFETCH_READ_LOCALITY(addr, locality) \
|
|
__builtin_prefetch(addr, 0, locality)
|
|
#define PREFETCH_WRITE_LOCALITY(addr, locality) \
|
|
__builtin_prefetch(addr, 1, locality)
|
|
#else
|
|
#define PREFETCH_READ(addr)
|
|
#define PREFETCH_READ_LOCALITY(addr, locality)
|
|
#define PREFETCH_WRITE(addr)
|
|
#define PREFETCH_WRITE_LOCALITY(addr, locality)
|
|
#endif
|
|
|
|
/*
|
|
The following macro is used to ensure that code often used in most
|
|
SQL statements and definitely for parts of the SQL processing are
|
|
kept in a code segment by itself. This has the advantage that the
|
|
risk of common code being overlapping in caches of the CPU is less.
|
|
This can be a cause of big performance problems.
|
|
Routines should be put in this category with care and when they are
|
|
put there one should also strive to make as much of the error handling
|
|
as possible (or uncommon code of the routine) to execute in a
|
|
separate method to avoid moving to much code to this code segment.
|
|
|
|
It is very easy to use, simply add HOT_METHOD at the end of the
|
|
function declaration.
|
|
For more input see GCC manual (available in GCC 2.95 and later)
|
|
*/
|
|
|
|
#if (__GNUC__ > 2) || (__GNUC__ == 2 && __GNUC_MINOR > 94)
|
|
#define HOT_METHOD \
|
|
__attribute__ ((section ("hot_code_section")))
|
|
#else
|
|
#define HOT_METHOD
|
|
#endif
|
|
|
|
/*
|
|
The following macro is used to ensure that popular global variables
|
|
are located next to each other to avoid that they contend for the
|
|
same cache lines.
|
|
|
|
It is very easy to use, simply add HOT_DATA at the end of the declaration
|
|
of the variable, the variable must be initialised because of the way
|
|
that linker works so a declaration using HOT_DATA should look like:
|
|
uint global_hot_data HOT_DATA = 0;
|
|
For more input see GCC manual (available in GCC 2.95 and later)
|
|
*/
|
|
|
|
#if (__GNUC__ > 2) || (__GNUC__ == 2 && __GNUC_MINOR > 94)
|
|
#define HOT_DATA \
|
|
__attribute__ ((section ("hot_data_section")))
|
|
#else
|
|
#define HOT_DATA
|
|
#endif
|
|
|
|
/*
|
|
now let's figure out if inline functions are supported
|
|
autoconf defines 'inline' to be empty, if not
|
|
*/
|
|
#define inline_test_1(X) X ## 1
|
|
#define inline_test_2(X) inline_test_1(X)
|
|
#if inline_test_2(inline) != 1
|
|
#define HAVE_INLINE
|
|
#endif
|
|
#undef inline_test_2
|
|
#undef inline_test_1
|
|
|
|
/*
|
|
The following macros are used to control inlining a bit more than
|
|
usual. These macros are used to ensure that inlining always or
|
|
never occurs (independent of compilation mode).
|
|
For more input see GCC manual (available in GCC 3.1.1 and later)
|
|
*/
|
|
|
|
#if (__GNUC__ > 3) || (__GNUC__ == 3 && __GNUC_MINOR > 10)
|
|
#define ALWAYS_INLINE __attribute__ ((always_inline))
|
|
#define NEVER_INLINE __attribute__ ((noinline))
|
|
#else
|
|
#define ALWAYS_INLINE
|
|
#define NEVER_INLINE
|
|
#endif
|
|
|
|
|
|
/* Fix problem with S_ISLNK() on Linux */
|
|
#if defined(TARGET_OS_LINUX) || defined(__GLIBC__)
|
|
#undef _GNU_SOURCE
|
|
#define _GNU_SOURCE 1
|
|
#endif
|
|
|
|
/*
|
|
Temporary solution to solve bug#7156. Include "sys/types.h" before
|
|
the thread headers, else the function madvise() will not be defined
|
|
*/
|
|
#if defined(HAVE_SYS_TYPES_H) && ( defined(sun) || defined(__sun) )
|
|
#include <sys/types.h>
|
|
#endif
|
|
|
|
/* The client defines this to avoid all thread code */
|
|
#if defined(UNDEF_THREADS_HACK)
|
|
#undef THREAD
|
|
#undef HAVE_LINUXTHREADS
|
|
#undef HAVE_NPTL
|
|
#endif
|
|
|
|
#ifdef HAVE_THREADS_WITHOUT_SOCKETS
|
|
/* MIT pthreads does not work with unix sockets */
|
|
#undef HAVE_SYS_UN_H
|
|
#endif
|
|
|
|
#define __EXTENSIONS__ 1 /* We want some extension */
|
|
#ifndef __STDC_EXT__
|
|
#define __STDC_EXT__ 1 /* To get large file support on hpux */
|
|
#endif
|
|
|
|
/*
|
|
Solaris 9 include file <sys/feature_tests.h> refers to X/Open document
|
|
|
|
System Interfaces and Headers, Issue 5
|
|
|
|
saying we should define _XOPEN_SOURCE=500 to get POSIX.1c prototypes,
|
|
but apparently other systems (namely FreeBSD) don't agree.
|
|
|
|
On a newer Solaris 10, the above file recognizes also _XOPEN_SOURCE=600.
|
|
Furthermore, it tests that if a program requires older standard
|
|
(_XOPEN_SOURCE<600 or _POSIX_C_SOURCE<200112L) it cannot be
|
|
run on a new compiler (that defines _STDC_C99) and issues an #error.
|
|
It's also an #error if a program requires new standard (_XOPEN_SOURCE=600
|
|
or _POSIX_C_SOURCE=200112L) and a compiler does not define _STDC_C99.
|
|
|
|
To add more to this mess, Sun Studio C compiler defines _STDC_C99 while
|
|
C++ compiler does not!
|
|
|
|
So, in a desperate attempt to get correct prototypes for both
|
|
C and C++ code, we define either _XOPEN_SOURCE=600 or _XOPEN_SOURCE=500
|
|
depending on the compiler's announced C standard support.
|
|
|
|
Cleaner solutions are welcome.
|
|
*/
|
|
#ifdef __sun
|
|
#if __STDC_VERSION__ - 0 >= 199901L
|
|
#define _XOPEN_SOURCE 600
|
|
#else
|
|
#define _XOPEN_SOURCE 500
|
|
#endif
|
|
#endif
|
|
|
|
#if defined(THREAD) && !defined(__WIN__)
|
|
#ifndef _POSIX_PTHREAD_SEMANTICS
|
|
#define _POSIX_PTHREAD_SEMANTICS /* We want posix threads */
|
|
#endif
|
|
|
|
#if !defined(SCO)
|
|
#define _REENTRANT 1 /* Some thread libraries require this */
|
|
#endif
|
|
#if !defined(_THREAD_SAFE) && !defined(_AIX)
|
|
#define _THREAD_SAFE /* Required for OSF1 */
|
|
#endif
|
|
#if defined(HPUX10) || defined(HPUX11)
|
|
C_MODE_START /* HPUX needs this, signal.h bug */
|
|
#include <pthread.h>
|
|
C_MODE_END
|
|
#else
|
|
#include <pthread.h> /* AIX must have this included first */
|
|
#endif
|
|
#if !defined(SCO) && !defined(_REENTRANT)
|
|
#define _REENTRANT 1 /* Threads requires reentrant code */
|
|
#endif
|
|
#endif /* THREAD */
|
|
|
|
/* Go around some bugs in different OS and compilers */
|
|
#ifdef _AIX /* By soren@t.dk */
|
|
#define _H_STRINGS
|
|
#define _SYS_STREAM_H
|
|
/* #define _AIX32_CURSES */ /* XXX: this breaks AIX 4.3.3 (others?). */
|
|
#define ulonglong2double(A) my_ulonglong2double(A)
|
|
#define my_off_t2double(A) my_ulonglong2double(A)
|
|
C_MODE_START
|
|
double my_ulonglong2double(unsigned long long A);
|
|
C_MODE_END
|
|
#endif /* _AIX */
|
|
|
|
#ifdef HAVE_BROKEN_SNPRINTF /* HPUX 10.20 don't have this defined */
|
|
#undef HAVE_SNPRINTF
|
|
#endif
|
|
#ifdef HAVE_BROKEN_PREAD
|
|
/*
|
|
pread()/pwrite() are not 64 bit safe on HP-UX 11.0 without
|
|
installing the kernel patch PHKL_20349 or greater
|
|
*/
|
|
#undef HAVE_PREAD
|
|
#undef HAVE_PWRITE
|
|
#endif
|
|
#if defined(HAVE_BROKEN_INLINE) && !defined(__cplusplus)
|
|
#undef inline
|
|
#define inline
|
|
#endif
|
|
|
|
#ifdef UNDEF_HAVE_GETHOSTBYNAME_R /* For OSF4.x */
|
|
#undef HAVE_GETHOSTBYNAME_R
|
|
#endif
|
|
#ifdef UNDEF_HAVE_INITGROUPS /* For AIX 4.3 */
|
|
#undef HAVE_INITGROUPS
|
|
#endif
|
|
|
|
/* gcc/egcs issues */
|
|
|
|
#if defined(__GNUC) && defined(__EXCEPTIONS)
|
|
#error "Please add -fno-exceptions to CXXFLAGS and reconfigure/recompile"
|
|
#endif
|
|
|
|
|
|
/* Fix a bug in gcc 2.8.0 on IRIX 6.2 */
|
|
#if SIZEOF_LONG == 4 && defined(__LONG_MAX__) && (__GNUC__ == 2 && __GNUC_MINOR__ == 8)
|
|
#undef __LONG_MAX__ /* Is a longlong value in gcc 2.8.0 ??? */
|
|
#define __LONG_MAX__ 2147483647
|
|
#endif
|
|
|
|
/* egcs 1.1.2 has a problem with memcpy on Alpha */
|
|
#if defined(__GNUC__) && defined(__alpha__) && ! (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95))
|
|
#define BAD_MEMCPY
|
|
#endif
|
|
|
|
#if defined(_lint) && !defined(lint)
|
|
#define lint
|
|
#endif
|
|
#if SIZEOF_LONG_LONG > 4 && !defined(_LONG_LONG)
|
|
#define _LONG_LONG 1 /* For AIX string library */
|
|
#endif
|
|
|
|
#ifndef stdin
|
|
#include <stdio.h>
|
|
#endif
|
|
#ifdef HAVE_STDLIB_H
|
|
#include <stdlib.h>
|
|
#endif
|
|
#ifdef HAVE_STDDEF_H
|
|
#include <stddef.h>
|
|
#endif
|
|
|
|
#include <math.h>
|
|
#ifdef HAVE_LIMITS_H
|
|
#include <limits.h>
|
|
#endif
|
|
#ifdef HAVE_FLOAT_H
|
|
#include <float.h>
|
|
#endif
|
|
|
|
#ifdef HAVE_SYS_TYPES_H
|
|
#include <sys/types.h>
|
|
#endif
|
|
#ifdef HAVE_FCNTL_H
|
|
#include <fcntl.h>
|
|
#endif
|
|
#ifdef HAVE_SYS_TIMEB_H
|
|
#include <sys/timeb.h> /* Avoid warnings on SCO */
|
|
#endif
|
|
#if TIME_WITH_SYS_TIME
|
|
# include <sys/time.h>
|
|
# include <time.h>
|
|
#else
|
|
# if HAVE_SYS_TIME_H
|
|
# include <sys/time.h>
|
|
# else
|
|
# include <time.h>
|
|
# endif
|
|
#endif /* TIME_WITH_SYS_TIME */
|
|
#ifdef HAVE_UNISTD_H
|
|
#include <unistd.h>
|
|
#endif
|
|
#if defined(__cplusplus) && defined(NO_CPLUSPLUS_ALLOCA)
|
|
#undef HAVE_ALLOCA
|
|
#undef HAVE_ALLOCA_H
|
|
#endif
|
|
#ifdef HAVE_ALLOCA_H
|
|
#include <alloca.h>
|
|
#endif
|
|
#ifdef HAVE_ATOMIC_ADD
|
|
#define new my_arg_new
|
|
#define need_to_restore_new 1
|
|
C_MODE_START
|
|
#include <asm/atomic.h>
|
|
C_MODE_END
|
|
#ifdef need_to_restore_new /* probably safer than #ifdef new */
|
|
#undef new
|
|
#undef need_to_restore_new
|
|
#endif
|
|
#endif
|
|
#include <errno.h> /* Recommended by debian */
|
|
/* We need the following to go around a problem with openssl on solaris */
|
|
#if defined(HAVE_CRYPT_H)
|
|
#include <crypt.h>
|
|
#endif
|
|
|
|
/*
|
|
A lot of our programs uses asserts, so better to always include it
|
|
This also fixes a problem when people uses DBUG_ASSERT without including
|
|
assert.h
|
|
*/
|
|
#include <assert.h>
|
|
|
|
/* Go around some bugs in different OS and compilers */
|
|
#if defined (HPUX11) && defined(_LARGEFILE_SOURCE)
|
|
#define _LARGEFILE64_SOURCE
|
|
#endif
|
|
#if defined(_HPUX_SOURCE) && defined(HAVE_SYS_STREAM_H)
|
|
#include <sys/stream.h> /* HPUX 10.20 defines ulong here. UGLY !!! */
|
|
#define HAVE_ULONG
|
|
#endif
|
|
#ifdef DONT_USE_FINITE /* HPUX 11.x has is_finite() */
|
|
#undef HAVE_FINITE
|
|
#endif
|
|
#if defined(HPUX10) && defined(_LARGEFILE64_SOURCE) && defined(THREAD)
|
|
/* Fix bug in setrlimit */
|
|
#undef setrlimit
|
|
#define setrlimit cma_setrlimit64
|
|
#endif
|
|
/* Declare madvise where it is not declared for C++, like Solaris */
|
|
#if HAVE_MADVISE && !HAVE_DECL_MADVISE && defined(__cplusplus)
|
|
extern "C" int madvise(void *addr, size_t len, int behav);
|
|
#endif
|
|
|
|
#ifdef __QNXNTO__
|
|
/* This has to be after include limits.h */
|
|
#define HAVE_ERRNO_AS_DEFINE
|
|
#define HAVE_FCNTL_LOCK
|
|
#undef HAVE_FINITE
|
|
#undef LONGLONG_MIN /* These get wrongly defined in QNX 6.2 */
|
|
#undef LONGLONG_MAX /* standard system library 'limits.h' */
|
|
#ifdef __cplusplus
|
|
#ifndef HAVE_RINT
|
|
#define HAVE_RINT
|
|
#endif /* rint() and isnan() functions are not */
|
|
#define rint(a) std::rint(a) /* visible in C++ scope due to an error */
|
|
#define isnan(a) std::isnan(a) /* in the usr/include/math.h on QNX */
|
|
#endif
|
|
#endif
|
|
|
|
/* We can not live without the following defines */
|
|
|
|
#define USE_MYFUNC 1 /* Must use syscall indirection */
|
|
#define MASTER 1 /* Compile without unireg */
|
|
#define ENGLISH 1 /* Messages in English */
|
|
#define POSIX_MISTAKE 1 /* regexp: Fix stupid spec error */
|
|
#define USE_REGEX 1 /* We want the use the regex library */
|
|
/* Do not define for ultra sparcs */
|
|
#define USE_BMOVE512 1 /* Use this unless system bmove is faster */
|
|
|
|
#define QUOTE_ARG(x) #x /* Quote argument (before cpp) */
|
|
#define STRINGIFY_ARG(x) QUOTE_ARG(x) /* Quote argument, after cpp */
|
|
|
|
/* Paranoid settings. Define I_AM_PARANOID if you are paranoid */
|
|
#ifdef I_AM_PARANOID
|
|
#define DONT_ALLOW_USER_CHANGE 1
|
|
#define DONT_USE_MYSQL_PWD 1
|
|
#endif
|
|
|
|
/* Does the system remember a signal handler after a signal ? */
|
|
#ifndef HAVE_BSD_SIGNALS
|
|
#define DONT_REMEMBER_SIGNAL
|
|
#endif
|
|
|
|
/* Define void to stop lint from generating "null effekt" comments */
|
|
#ifndef DONT_DEFINE_VOID
|
|
#ifdef _lint
|
|
int __void__;
|
|
#define VOID(X) (__void__ = (int) (X))
|
|
#else
|
|
#undef VOID
|
|
#define VOID(X) (X)
|
|
#endif
|
|
#endif /* DONT_DEFINE_VOID */
|
|
|
|
#if defined(_lint) || defined(FORCE_INIT_OF_VARS)
|
|
#define LINT_INIT(var) var=0 /* No uninitialize-warning */
|
|
#else
|
|
#define LINT_INIT(var)
|
|
#endif
|
|
|
|
#if defined(_lint) || defined(FORCE_INIT_OF_VARS) || defined(HAVE_purify)
|
|
#define PURIFY_OR_LINT_INIT(var) var=0
|
|
#else
|
|
#define PURIFY_OR_LINT_INIT(var)
|
|
#endif
|
|
|
|
/* Define some useful general macros */
|
|
#if !defined(max)
|
|
#define max(a, b) ((a) > (b) ? (a) : (b))
|
|
#define min(a, b) ((a) < (b) ? (a) : (b))
|
|
#endif
|
|
|
|
#if !defined(HAVE_UINT)
|
|
#undef HAVE_UINT
|
|
#define HAVE_UINT
|
|
typedef unsigned int uint;
|
|
typedef unsigned short ushort;
|
|
#endif
|
|
|
|
#define CMP_NUM(a,b) (((a) < (b)) ? -1 : ((a) == (b)) ? 0 : 1)
|
|
#define sgn(a) (((a) < 0) ? -1 : ((a) > 0) ? 1 : 0)
|
|
#define swap_variables(t, a, b) { register t dummy; dummy= a; a= b; b= dummy; }
|
|
#define test(a) ((a) ? 1 : 0)
|
|
#define set_if_bigger(a,b) do { if ((a) < (b)) (a)=(b); } while(0)
|
|
#define set_if_smaller(a,b) do { if ((a) > (b)) (a)=(b); } while(0)
|
|
#define test_all_bits(a,b) (((a) & (b)) == (b))
|
|
#define set_bits(type, bit_count) (sizeof(type)*8 <= (bit_count) ? ~(type) 0 : ((((type) 1) << (bit_count)) - (type) 1))
|
|
#define array_elements(A) ((uint) (sizeof(A)/sizeof(A[0])))
|
|
#ifndef HAVE_RINT
|
|
#define rint(A) floor((A)+(((A) < 0)? -0.5 : 0.5))
|
|
#endif
|
|
|
|
/* Define some general constants */
|
|
#ifndef TRUE
|
|
#define TRUE (1) /* Logical true */
|
|
#define FALSE (0) /* Logical false */
|
|
#endif
|
|
|
|
#if defined(__GNUC__)
|
|
#define function_volatile volatile
|
|
#define my_reinterpret_cast(A) reinterpret_cast<A>
|
|
#define my_const_cast(A) const_cast<A>
|
|
# ifndef GCC_VERSION
|
|
# define GCC_VERSION (__GNUC__ * 1000 + __GNUC_MINOR__)
|
|
# endif
|
|
#elif !defined(my_reinterpret_cast)
|
|
#define my_reinterpret_cast(A) (A)
|
|
#define my_const_cast(A) (A)
|
|
#endif
|
|
|
|
/*
|
|
Disable __attribute__() on gcc < 2.7, g++ < 3.4, and non-gcc compilers.
|
|
Some forms of __attribute__ are actually supported in earlier versions of
|
|
g++, but we just disable them all because we only use them to generate
|
|
compilation warnings.
|
|
*/
|
|
#ifndef __attribute__
|
|
# if !defined(__GNUC__)
|
|
# define __attribute__(A)
|
|
# elif GCC_VERSION < 2008
|
|
# define __attribute__(A)
|
|
# elif defined(__cplusplus) && GCC_VERSION < 3004
|
|
# define __attribute__(A)
|
|
# endif
|
|
#endif
|
|
|
|
/*
|
|
__attribute__((format(...))) is only supported in gcc >= 2.8 and g++ >= 3.4
|
|
But that's already covered by the __attribute__ tests above, so this is
|
|
just a convenience macro.
|
|
*/
|
|
#ifndef ATTRIBUTE_FORMAT
|
|
# define ATTRIBUTE_FORMAT(style, m, n) __attribute__((format(style, m, n)))
|
|
#endif
|
|
|
|
/*
|
|
|
|
__attribute__((format(...))) on a function pointer is not supported
|
|
until gcc 3.1
|
|
*/
|
|
#ifndef ATTRIBUTE_FORMAT_FPTR
|
|
# if (GCC_VERSION >= 3001)
|
|
# define ATTRIBUTE_FORMAT_FPTR(style, m, n) ATTRIBUTE_FORMAT(style, m, n)
|
|
# else
|
|
# define ATTRIBUTE_FORMAT_FPTR(style, m, n)
|
|
# endif /* GNUC >= 3.1 */
|
|
#endif
|
|
|
|
/*
|
|
Wen using the embedded library, users might run into link problems,
|
|
duplicate declaration of __cxa_pure_virtual, solved by declaring it a
|
|
weak symbol.
|
|
*/
|
|
#ifdef USE_MYSYS_NEW
|
|
C_MODE_START
|
|
int __cxa_pure_virtual () __attribute__ ((weak));
|
|
C_MODE_END
|
|
#endif
|
|
|
|
/* From old s-system.h */
|
|
|
|
/*
|
|
Support macros for non ansi & other old compilers. Since such
|
|
things are no longer supported we do nothing. We keep then since
|
|
some of our code may still be needed to upgrade old customers.
|
|
*/
|
|
#define _VARARGS(X) X
|
|
#define _STATIC_VARARGS(X) X
|
|
#define _PC(X) X
|
|
|
|
/* The DBUG_ON flag always takes precedence over default DBUG_OFF */
|
|
#if defined(DBUG_ON) && defined(DBUG_OFF)
|
|
#undef DBUG_OFF
|
|
#endif
|
|
|
|
/* We might be forced to turn debug off, if not turned off already */
|
|
#if (defined(FORCE_DBUG_OFF) || defined(_lint)) && !defined(DBUG_OFF)
|
|
# define DBUG_OFF
|
|
# ifdef DBUG_ON
|
|
# undef DBUG_ON
|
|
# endif
|
|
#endif
|
|
|
|
#include <my_dbug.h>
|
|
|
|
#define MIN_ARRAY_SIZE 0 /* Zero or One. Gcc allows zero*/
|
|
#define ASCII_BITS_USED 8 /* Bit char used */
|
|
#define NEAR_F /* No near function handling */
|
|
|
|
/* Some types that is different between systems */
|
|
|
|
typedef int File; /* File descriptor */
|
|
#ifndef Socket_defined
|
|
typedef int my_socket; /* File descriptor for sockets */
|
|
#define INVALID_SOCKET -1
|
|
#endif
|
|
/* Type for fuctions that handles signals */
|
|
#define sig_handler RETSIGTYPE
|
|
C_MODE_START
|
|
typedef void (*sig_return)();/* Returns type from signal */
|
|
C_MODE_END
|
|
#if defined(__GNUC__) && !defined(_lint)
|
|
typedef char pchar; /* Mixed prototypes can take char */
|
|
typedef char puchar; /* Mixed prototypes can take char */
|
|
typedef char pbool; /* Mixed prototypes can take char */
|
|
typedef short pshort; /* Mixed prototypes can take short int */
|
|
typedef float pfloat; /* Mixed prototypes can take float */
|
|
#else
|
|
typedef int pchar; /* Mixed prototypes can't take char */
|
|
typedef uint puchar; /* Mixed prototypes can't take char */
|
|
typedef int pbool; /* Mixed prototypes can't take char */
|
|
typedef int pshort; /* Mixed prototypes can't take short int */
|
|
typedef double pfloat; /* Mixed prototypes can't take float */
|
|
#endif
|
|
C_MODE_START
|
|
typedef int (*qsort_cmp)(const void *,const void *);
|
|
typedef int (*qsort_cmp2)(void*, const void *,const void *);
|
|
C_MODE_END
|
|
#define qsort_t RETQSORTTYPE /* Broken GCC cant handle typedef !!!! */
|
|
#ifdef HAVE_SYS_SOCKET_H
|
|
#include <sys/socket.h>
|
|
#endif
|
|
typedef SOCKET_SIZE_TYPE size_socket;
|
|
|
|
#ifndef SOCKOPT_OPTLEN_TYPE
|
|
#define SOCKOPT_OPTLEN_TYPE size_socket
|
|
#endif
|
|
|
|
/* file create flags */
|
|
|
|
#ifndef O_SHARE /* Probably not windows */
|
|
#define O_SHARE 0 /* Flag to my_open for shared files */
|
|
#ifndef O_BINARY
|
|
#define O_BINARY 0 /* Flag to my_open for binary files */
|
|
#endif
|
|
#ifndef FILE_BINARY
|
|
#define FILE_BINARY O_BINARY /* Flag to my_fopen for binary streams */
|
|
#endif
|
|
#ifdef HAVE_FCNTL
|
|
#define HAVE_FCNTL_LOCK
|
|
#define F_TO_EOF 0L /* Param to lockf() to lock rest of file */
|
|
#endif
|
|
#endif /* O_SHARE */
|
|
|
|
#ifndef O_TEMPORARY
|
|
#define O_TEMPORARY 0
|
|
#endif
|
|
#ifndef O_SHORT_LIVED
|
|
#define O_SHORT_LIVED 0
|
|
#endif
|
|
#ifndef O_NOFOLLOW
|
|
#define O_NOFOLLOW 0
|
|
#endif
|
|
|
|
/* additional file share flags for win32 */
|
|
#ifdef __WIN__
|
|
#define _SH_DENYRWD 0x110 /* deny read/write mode & delete */
|
|
#define _SH_DENYWRD 0x120 /* deny write mode & delete */
|
|
#define _SH_DENYRDD 0x130 /* deny read mode & delete */
|
|
#define _SH_DENYDEL 0x140 /* deny delete only */
|
|
#endif /* __WIN__ */
|
|
|
|
|
|
/* #define USE_RECORD_LOCK */
|
|
|
|
/* Unsigned types supported by the compiler */
|
|
#define UNSINT8 /* unsigned int8 (char) */
|
|
#define UNSINT16 /* unsigned int16 */
|
|
#define UNSINT32 /* unsigned int32 */
|
|
|
|
/* General constants */
|
|
#define SC_MAXWIDTH 256 /* Max width of screen (for error messages) */
|
|
#define FN_LEN 256 /* Max file name len */
|
|
#define FN_HEADLEN 253 /* Max length of filepart of file name */
|
|
#define FN_EXTLEN 20 /* Max length of extension (part of FN_LEN) */
|
|
#define FN_REFLEN 512 /* Max length of full path-name */
|
|
#define FN_EXTCHAR '.'
|
|
#define FN_HOMELIB '~' /* ~/ is used as abbrev for home dir */
|
|
#define FN_CURLIB '.' /* ./ is used as abbrev for current dir */
|
|
#define FN_PARENTDIR ".." /* Parent directory; Must be a string */
|
|
|
|
#ifndef FN_LIBCHAR
|
|
#define FN_LIBCHAR '/'
|
|
#define FN_ROOTDIR "/"
|
|
#endif
|
|
#define MY_NFILE 64 /* This is only used to save filenames */
|
|
#ifndef OS_FILE_LIMIT
|
|
#define OS_FILE_LIMIT 65535
|
|
#endif
|
|
|
|
/* #define EXT_IN_LIBNAME */
|
|
/* #define FN_NO_CASE_SENCE */
|
|
/* #define FN_UPPER_CASE TRUE */
|
|
|
|
/*
|
|
Io buffer size; Must be a power of 2 and a multiple of 512. May be
|
|
smaller what the disk page size. This influences the speed of the
|
|
isam btree library. eg to big to slow.
|
|
*/
|
|
#define IO_SIZE 4096
|
|
/*
|
|
How much overhead does malloc have. The code often allocates
|
|
something like 1024-MALLOC_OVERHEAD bytes
|
|
*/
|
|
#ifdef SAFEMALLOC
|
|
#define MALLOC_OVERHEAD (8+24+4)
|
|
#else
|
|
#define MALLOC_OVERHEAD 8
|
|
#endif
|
|
/* get memory in huncs */
|
|
#define ONCE_ALLOC_INIT (uint) (4096-MALLOC_OVERHEAD)
|
|
/* Typical record cash */
|
|
#define RECORD_CACHE_SIZE (uint) (64*1024-MALLOC_OVERHEAD)
|
|
/* Typical key cash */
|
|
#define KEY_CACHE_SIZE (uint) (8*1024*1024-MALLOC_OVERHEAD)
|
|
/* Default size of a key cache block */
|
|
#define KEY_CACHE_BLOCK_SIZE (uint) 1024
|
|
|
|
|
|
/* Some things that this system doesn't have */
|
|
|
|
#define NO_HASH /* Not needed anymore */
|
|
#ifdef __WIN__
|
|
#define NO_DIR_LIBRARY /* Not standar dir-library */
|
|
#define USE_MY_STAT_STRUCT /* For my_lib */
|
|
#endif
|
|
|
|
/* Some defines of functions for portability */
|
|
|
|
#undef remove /* Crashes MySQL on SCO 5.0.0 */
|
|
#ifndef __WIN__
|
|
#define closesocket(A) close(A)
|
|
#ifndef ulonglong2double
|
|
#define ulonglong2double(A) ((double) (ulonglong) (A))
|
|
#define my_off_t2double(A) ((double) (my_off_t) (A))
|
|
#endif
|
|
#endif
|
|
|
|
#ifndef offsetof
|
|
#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
|
|
#endif
|
|
#define ulong_to_double(X) ((double) (ulong) (X))
|
|
#define SET_STACK_SIZE(X) /* Not needed on real machines */
|
|
|
|
#if !defined(HAVE_STRTOK_R)
|
|
#define strtok_r(A,B,C) strtok((A),(B))
|
|
#endif
|
|
|
|
/* This is from the old m-machine.h file */
|
|
|
|
#if SIZEOF_LONG_LONG > 4
|
|
#define HAVE_LONG_LONG 1
|
|
#endif
|
|
|
|
/*
|
|
Some pre-ANSI-C99 systems like AIX 5.1 and Linux/GCC 2.95 define
|
|
ULONGLONG_MAX, LONGLONG_MIN, LONGLONG_MAX; we use them if they're defined.
|
|
Also on Windows we define these constants by hand in config-win.h.
|
|
*/
|
|
|
|
#if defined(HAVE_LONG_LONG) && !defined(LONGLONG_MIN)
|
|
#define LONGLONG_MIN ((long long) 0x8000000000000000LL)
|
|
#define LONGLONG_MAX ((long long) 0x7FFFFFFFFFFFFFFFLL)
|
|
#endif
|
|
|
|
#if defined(HAVE_LONG_LONG) && !defined(ULONGLONG_MAX)
|
|
/* First check for ANSI C99 definition: */
|
|
#ifdef ULLONG_MAX
|
|
#define ULONGLONG_MAX ULLONG_MAX
|
|
#else
|
|
#define ULONGLONG_MAX ((unsigned long long)(~0ULL))
|
|
#endif
|
|
#endif /* defined (HAVE_LONG_LONG) && !defined(ULONGLONG_MAX)*/
|
|
|
|
#define INT_MIN32 (~0x7FFFFFFFL)
|
|
#define INT_MAX32 0x7FFFFFFFL
|
|
#define UINT_MAX32 0xFFFFFFFFL
|
|
#define INT_MIN24 (~0x007FFFFF)
|
|
#define INT_MAX24 0x007FFFFF
|
|
#define UINT_MAX24 0x00FFFFFF
|
|
#define INT_MIN16 (~0x7FFF)
|
|
#define INT_MAX16 0x7FFF
|
|
#define UINT_MAX16 0xFFFF
|
|
#define INT_MIN8 (~0x7F)
|
|
#define INT_MAX8 0x7F
|
|
#define UINT_MAX8 0xFF
|
|
|
|
/* From limits.h instead */
|
|
#ifndef DBL_MIN
|
|
#define DBL_MIN 4.94065645841246544e-324
|
|
#define FLT_MIN ((float)1.40129846432481707e-45)
|
|
#endif
|
|
#ifndef DBL_MAX
|
|
#define DBL_MAX 1.79769313486231470e+308
|
|
#define FLT_MAX ((float)3.40282346638528860e+38)
|
|
#endif
|
|
#ifndef SSIZE_MAX
|
|
#define SSIZE_MAX ((~((size_t) 0)) / 2)
|
|
#endif
|
|
|
|
#if !defined(HAVE_ISINF) && !defined(isinf)
|
|
#define isinf(X) 0
|
|
#endif
|
|
|
|
/* Define missing math constants. */
|
|
#ifndef M_PI
|
|
#define M_PI 3.14159265358979323846
|
|
#endif
|
|
#ifndef M_E
|
|
#define M_E 2.7182818284590452354
|
|
#endif
|
|
#ifndef M_LN2
|
|
#define M_LN2 0.69314718055994530942
|
|
#endif
|
|
|
|
/*
|
|
Max size that must be added to a so that we know Size to make
|
|
adressable obj.
|
|
*/
|
|
#if SIZEOF_CHARP == 4
|
|
typedef long my_ptrdiff_t;
|
|
#else
|
|
typedef long long my_ptrdiff_t;
|
|
#endif
|
|
|
|
/* We can't set my_size_t to size_t as we want my_size_t to be unsigned */
|
|
#if SIZEOF_CHARP <= SIZEOF_LONG
|
|
typedef unsigned long my_size_t;
|
|
#else
|
|
typedef unsigned long long my_size_t;
|
|
#endif
|
|
|
|
#define MY_ALIGN(A,L) (((A) + (L) - 1) & ~((L) - 1))
|
|
#define ALIGN_SIZE(A) MY_ALIGN((A),sizeof(double))
|
|
/* Size to make adressable obj. */
|
|
#define ALIGN_PTR(A, t) ((t*) MY_ALIGN((A),sizeof(t)))
|
|
/* Offset of field f in structure t */
|
|
#define OFFSET(t, f) ((size_t)(char *)&((t *)0)->f)
|
|
#define ADD_TO_PTR(ptr,size,type) (type) ((byte*) (ptr)+size)
|
|
#define PTR_BYTE_DIFF(A,B) (my_ptrdiff_t) ((byte*) (A) - (byte*) (B))
|
|
|
|
/*
|
|
Custom version of standard offsetof() macro which can be used to get
|
|
offsets of members in class for non-POD types (according to the current
|
|
version of C++ standard offsetof() macro can't be used in such cases and
|
|
attempt to do so causes warnings to be emitted, OTOH in many cases it is
|
|
still OK to assume that all instances of the class has the same offsets
|
|
for the same members).
|
|
|
|
This is temporary solution which should be removed once File_parser class
|
|
and related routines are refactored.
|
|
*/
|
|
|
|
#define my_offsetof(TYPE, MEMBER) \
|
|
((size_t)((char *)&(((TYPE *)0x10)->MEMBER) - (char*)0x10))
|
|
|
|
|
|
#define NullS (char *) 0
|
|
/* Nowdays we do not support MessyDos */
|
|
#ifndef NEAR
|
|
#define NEAR /* Who needs segments ? */
|
|
#define FAR /* On a good machine */
|
|
#ifndef HUGE_PTR
|
|
#define HUGE_PTR
|
|
#endif
|
|
#endif
|
|
#if defined(__IBMC__) || defined(__IBMCPP__)
|
|
/* This was _System _Export but caused a lot of warnings on _AIX43 */
|
|
#define STDCALL
|
|
#elif !defined( STDCALL)
|
|
#define STDCALL
|
|
#endif
|
|
|
|
/* Typdefs for easyier portability */
|
|
|
|
#if defined(VOIDTYPE)
|
|
typedef void *gptr; /* Generic pointer */
|
|
#else
|
|
typedef char *gptr; /* Generic pointer */
|
|
#endif
|
|
#ifndef HAVE_UCHAR
|
|
typedef unsigned char uchar; /* Short for unsigned char */
|
|
#endif
|
|
|
|
#ifndef HAVE_INT8
|
|
typedef signed char int8; /* Signed integer >= 8 bits */
|
|
#endif
|
|
#ifndef HAVE_UINT8
|
|
typedef unsigned char uint8; /* Unsigned integer >= 8 bits */
|
|
#endif
|
|
#ifndef HAVE_INT16
|
|
typedef short int16;
|
|
#endif
|
|
#ifndef HAVE_UINT16
|
|
typedef unsigned short uint16;
|
|
#endif
|
|
#if SIZEOF_INT == 4
|
|
#ifndef HAVE_INT32
|
|
typedef int int32;
|
|
#endif
|
|
#ifndef HAVE_UINT32
|
|
typedef unsigned int uint32;
|
|
#endif
|
|
#elif SIZEOF_LONG == 4
|
|
#ifndef HAVE_INT32
|
|
typedef long int32;
|
|
#endif
|
|
#ifndef HAVE_UINT32
|
|
typedef unsigned long uint32;
|
|
#endif
|
|
#else
|
|
#error "Neither int or long is of 4 bytes width"
|
|
#endif
|
|
|
|
#if !defined(HAVE_ULONG) && !defined(__USE_MISC)
|
|
typedef unsigned long ulong; /* Short for unsigned long */
|
|
#endif
|
|
#ifndef longlong_defined
|
|
#if defined(HAVE_LONG_LONG) && SIZEOF_LONG != 8
|
|
typedef unsigned long long int ulonglong; /* ulong or unsigned long long */
|
|
typedef long long int longlong;
|
|
#else
|
|
typedef unsigned long ulonglong; /* ulong or unsigned long long */
|
|
typedef long longlong;
|
|
#endif
|
|
#endif
|
|
#ifndef HAVE_INT64
|
|
typedef longlong int64;
|
|
#endif
|
|
#ifndef HAVE_UINT64
|
|
typedef ulonglong uint64;
|
|
#endif
|
|
|
|
#if defined(NO_CLIENT_LONG_LONG)
|
|
typedef unsigned long my_ulonglong;
|
|
#elif defined (__WIN__)
|
|
typedef unsigned __int64 my_ulonglong;
|
|
#else
|
|
typedef unsigned long long my_ulonglong;
|
|
#endif
|
|
|
|
#ifdef USE_RAID
|
|
/*
|
|
The following is done with a if to not get problems with pre-processors
|
|
with late define evaluation
|
|
*/
|
|
#if SIZEOF_OFF_T == 4
|
|
#define SYSTEM_SIZEOF_OFF_T 4
|
|
#else
|
|
#define SYSTEM_SIZEOF_OFF_T 8
|
|
#endif
|
|
#undef SIZEOF_OFF_T
|
|
#define SIZEOF_OFF_T 8
|
|
#else
|
|
#define SYSTEM_SIZEOF_OFF_T SIZEOF_OFF_T
|
|
#endif /* USE_RAID */
|
|
|
|
#if SIZEOF_OFF_T > 4
|
|
typedef ulonglong my_off_t;
|
|
#else
|
|
typedef unsigned long my_off_t;
|
|
#endif
|
|
#define MY_FILEPOS_ERROR (~(my_off_t) 0)
|
|
#if !defined(__WIN__)
|
|
typedef off_t os_off_t;
|
|
#endif
|
|
|
|
#if defined(__WIN__)
|
|
#define socket_errno WSAGetLastError()
|
|
#define SOCKET_EINTR WSAEINTR
|
|
#define SOCKET_EAGAIN WSAEINPROGRESS
|
|
#define SOCKET_ETIMEDOUT WSAETIMEDOUT
|
|
#define SOCKET_EWOULDBLOCK WSAEWOULDBLOCK
|
|
#define SOCKET_EADDRINUSE WSAEADDRINUSE
|
|
#define SOCKET_ENFILE ENFILE
|
|
#define SOCKET_EMFILE EMFILE
|
|
#else /* Unix */
|
|
#define socket_errno errno
|
|
#define closesocket(A) close(A)
|
|
#define SOCKET_EINTR EINTR
|
|
#define SOCKET_EAGAIN EAGAIN
|
|
#define SOCKET_ETIMEDOUT SOCKET_EINTR
|
|
#define SOCKET_EWOULDBLOCK EWOULDBLOCK
|
|
#define SOCKET_EADDRINUSE EADDRINUSE
|
|
#define SOCKET_ENFILE ENFILE
|
|
#define SOCKET_EMFILE EMFILE
|
|
#endif
|
|
|
|
typedef uint8 int7; /* Most effective integer 0 <= x <= 127 */
|
|
typedef short int15; /* Most effective integer 0 <= x <= 32767 */
|
|
typedef char *my_string; /* String of characters */
|
|
typedef unsigned long size_s; /* Size of strings (In string-funcs) */
|
|
typedef int myf; /* Type of MyFlags in my_funcs */
|
|
#ifndef byte_defined
|
|
typedef char byte; /* Smallest addressable unit */
|
|
#endif
|
|
typedef char my_bool; /* Small bool */
|
|
#if !defined(bool) && !defined(bool_defined) && (!defined(HAVE_BOOL) || !defined(__cplusplus))
|
|
typedef char bool; /* Ordinary boolean values 0 1 */
|
|
#endif
|
|
/* Macros for converting *constants* to the right type */
|
|
#define INT8(v) (int8) (v)
|
|
#define INT16(v) (int16) (v)
|
|
#define INT32(v) (int32) (v)
|
|
#define MYF(v) (myf) (v)
|
|
|
|
#ifndef LL
|
|
#ifdef HAVE_LONG_LONG
|
|
#define LL(A) A ## LL
|
|
#else
|
|
#define LL(A) A ## L
|
|
#endif
|
|
#endif
|
|
|
|
#ifndef ULL
|
|
#ifdef HAVE_LONG_LONG
|
|
#define ULL(A) A ## ULL
|
|
#else
|
|
#define ULL(A) A ## UL
|
|
#endif
|
|
#endif
|
|
|
|
/*
|
|
Defines to make it possible to prioritize register assignments. No
|
|
longer that important with modern compilers.
|
|
*/
|
|
#ifndef USING_X
|
|
#define reg1 register
|
|
#define reg2 register
|
|
#define reg3 register
|
|
#define reg4 register
|
|
#define reg5 register
|
|
#define reg6 register
|
|
#define reg7 register
|
|
#define reg8 register
|
|
#define reg9 register
|
|
#define reg10 register
|
|
#define reg11 register
|
|
#define reg12 register
|
|
#define reg13 register
|
|
#define reg14 register
|
|
#define reg15 register
|
|
#define reg16 register
|
|
#endif
|
|
|
|
/*
|
|
Sometimes we want to make sure that the variable is not put into
|
|
a register in debugging mode so we can see its value in the core
|
|
*/
|
|
|
|
#ifndef DBUG_OFF
|
|
#define dbug_volatile volatile
|
|
#else
|
|
#define dbug_volatile
|
|
#endif
|
|
|
|
/* Defines for time function */
|
|
#define SCALE_SEC 100
|
|
#define SCALE_USEC 10000
|
|
#define MY_HOW_OFTEN_TO_ALARM 2 /* How often we want info on screen */
|
|
#define MY_HOW_OFTEN_TO_WRITE 1000 /* How often we want info on screen */
|
|
|
|
#ifdef HAVE_TIMESPEC_TS_SEC
|
|
#ifndef set_timespec
|
|
#define set_timespec(ABSTIME,SEC) \
|
|
{ \
|
|
(ABSTIME).ts_sec=time(0) + (time_t) (SEC); \
|
|
(ABSTIME).ts_nsec=0; \
|
|
}
|
|
#endif /* !set_timespec */
|
|
#ifndef set_timespec_nsec
|
|
#define set_timespec_nsec(ABSTIME,NSEC) \
|
|
{ \
|
|
ulonglong now= my_getsystime() + (NSEC/100); \
|
|
(ABSTIME).ts_sec= (now / ULL(10000000)); \
|
|
(ABSTIME).ts_nsec= (now % ULL(10000000) * 100 + ((NSEC) % 100)); \
|
|
}
|
|
#endif /* !set_timespec_nsec */
|
|
#else
|
|
#ifndef set_timespec
|
|
#define set_timespec(ABSTIME,SEC) \
|
|
{\
|
|
struct timeval tv;\
|
|
gettimeofday(&tv,0);\
|
|
(ABSTIME).tv_sec=tv.tv_sec+(time_t) (SEC);\
|
|
(ABSTIME).tv_nsec=tv.tv_usec*1000;\
|
|
}
|
|
#endif /* !set_timespec */
|
|
#ifndef set_timespec_nsec
|
|
#define set_timespec_nsec(ABSTIME,NSEC) \
|
|
{\
|
|
ulonglong now= my_getsystime() + (NSEC/100); \
|
|
(ABSTIME).tv_sec= (time_t) (now / ULL(10000000)); \
|
|
(ABSTIME).tv_nsec= (long) (now % ULL(10000000) * 100 + ((NSEC) % 100)); \
|
|
}
|
|
#endif /* !set_timespec_nsec */
|
|
#endif /* HAVE_TIMESPEC_TS_SEC */
|
|
|
|
/*
|
|
Define-funktions for reading and storing in machine independent format
|
|
(low byte first)
|
|
*/
|
|
|
|
/* Optimized store functions for Intel x86 */
|
|
#if defined(__i386__) && !defined(_WIN64)
|
|
#define sint2korr(A) (*((int16 *) (A)))
|
|
#define sint3korr(A) ((int32) ((((uchar) (A)[2]) & 128) ? \
|
|
(((uint32) 255L << 24) | \
|
|
(((uint32) (uchar) (A)[2]) << 16) |\
|
|
(((uint32) (uchar) (A)[1]) << 8) | \
|
|
((uint32) (uchar) (A)[0])) : \
|
|
(((uint32) (uchar) (A)[2]) << 16) |\
|
|
(((uint32) (uchar) (A)[1]) << 8) | \
|
|
((uint32) (uchar) (A)[0])))
|
|
#define sint4korr(A) (*((long *) (A)))
|
|
#define uint2korr(A) (*((uint16 *) (A)))
|
|
#ifdef HAVE_purify
|
|
#define uint3korr(A) (uint32) (((uint32) ((uchar) (A)[0])) +\
|
|
(((uint32) ((uchar) (A)[1])) << 8) +\
|
|
(((uint32) ((uchar) (A)[2])) << 16))
|
|
#else
|
|
/*
|
|
ATTENTION !
|
|
|
|
Please, note, uint3korr reads 4 bytes (not 3) !
|
|
It means, that you have to provide enough allocated space !
|
|
*/
|
|
#define uint3korr(A) (long) (*((unsigned int *) (A)) & 0xFFFFFF)
|
|
#endif
|
|
#define uint4korr(A) (*((unsigned long *) (A)))
|
|
#define uint5korr(A) ((ulonglong)(((uint32) ((uchar) (A)[0])) +\
|
|
(((uint32) ((uchar) (A)[1])) << 8) +\
|
|
(((uint32) ((uchar) (A)[2])) << 16) +\
|
|
(((uint32) ((uchar) (A)[3])) << 24)) +\
|
|
(((ulonglong) ((uchar) (A)[4])) << 32))
|
|
#define uint6korr(A) ((ulonglong)(((uint32) ((uchar) (A)[0])) + \
|
|
(((uint32) ((uchar) (A)[1])) << 8) + \
|
|
(((uint32) ((uchar) (A)[2])) << 16) + \
|
|
(((uint32) ((uchar) (A)[3])) << 24)) + \
|
|
(((ulonglong) ((uchar) (A)[4])) << 32) + \
|
|
(((ulonglong) ((uchar) (A)[5])) << 40))
|
|
#define uint8korr(A) (*((ulonglong *) (A)))
|
|
#define sint8korr(A) (*((longlong *) (A)))
|
|
#define int2store(T,A) *((uint16*) (T))= (uint16) (A)
|
|
#define int3store(T,A) do { *(T)= (uchar) ((A));\
|
|
*(T+1)=(uchar) (((uint) (A) >> 8));\
|
|
*(T+2)=(uchar) (((A) >> 16)); } while (0)
|
|
#define int4store(T,A) *((long *) (T))= (long) (A)
|
|
#define int5store(T,A) do { *(T)= (uchar)((A));\
|
|
*((T)+1)=(uchar) (((A) >> 8));\
|
|
*((T)+2)=(uchar) (((A) >> 16));\
|
|
*((T)+3)=(uchar) (((A) >> 24)); \
|
|
*((T)+4)=(uchar) (((A) >> 32)); } while(0)
|
|
#define int6store(T,A) do { *(T)= (uchar)((A)); \
|
|
*((T)+1)=(uchar) (((A) >> 8)); \
|
|
*((T)+2)=(uchar) (((A) >> 16)); \
|
|
*((T)+3)=(uchar) (((A) >> 24)); \
|
|
*((T)+4)=(uchar) (((A) >> 32)); \
|
|
*((T)+5)=(uchar) (((A) >> 40)); } while(0)
|
|
#define int8store(T,A) *((ulonglong *) (T))= (ulonglong) (A)
|
|
|
|
typedef union {
|
|
double v;
|
|
long m[2];
|
|
} doubleget_union;
|
|
#define doubleget(V,M) \
|
|
do { doubleget_union _tmp; \
|
|
_tmp.m[0] = *((long*)(M)); \
|
|
_tmp.m[1] = *(((long*) (M))+1); \
|
|
(V) = _tmp.v; } while(0)
|
|
#define doublestore(T,V) do { *((long *) T) = ((doubleget_union *)&V)->m[0]; \
|
|
*(((long *) T)+1) = ((doubleget_union *)&V)->m[1]; \
|
|
} while (0)
|
|
#define float4get(V,M) do { *((float *) &(V)) = *((float*) (M)); } while(0)
|
|
#define float8get(V,M) doubleget((V),(M))
|
|
#define float4store(V,M) memcpy((byte*) V,(byte*) (&M),sizeof(float))
|
|
#define floatstore(T,V) memcpy((byte*)(T), (byte*)(&V),sizeof(float))
|
|
#define floatget(V,M) memcpy((byte*) &V,(byte*) (M),sizeof(float))
|
|
#define float8store(V,M) doublestore((V),(M))
|
|
#endif /* __i386__ */
|
|
|
|
#ifndef sint2korr
|
|
/*
|
|
We're here if it's not a IA-32 architecture (Win32 and UNIX IA-32 defines
|
|
were done before)
|
|
*/
|
|
#define sint2korr(A) (int16) (((int16) ((uchar) (A)[0])) +\
|
|
((int16) ((int16) (A)[1]) << 8))
|
|
#define sint3korr(A) ((int32) ((((uchar) (A)[2]) & 128) ? \
|
|
(((uint32) 255L << 24) | \
|
|
(((uint32) (uchar) (A)[2]) << 16) |\
|
|
(((uint32) (uchar) (A)[1]) << 8) | \
|
|
((uint32) (uchar) (A)[0])) : \
|
|
(((uint32) (uchar) (A)[2]) << 16) |\
|
|
(((uint32) (uchar) (A)[1]) << 8) | \
|
|
((uint32) (uchar) (A)[0])))
|
|
#define sint4korr(A) (int32) (((int32) ((uchar) (A)[0])) +\
|
|
(((int32) ((uchar) (A)[1]) << 8)) +\
|
|
(((int32) ((uchar) (A)[2]) << 16)) +\
|
|
(((int32) ((int16) (A)[3]) << 24)))
|
|
#define sint8korr(A) (longlong) uint8korr(A)
|
|
#define uint2korr(A) (uint16) (((uint16) ((uchar) (A)[0])) +\
|
|
((uint16) ((uchar) (A)[1]) << 8))
|
|
#define uint3korr(A) (uint32) (((uint32) ((uchar) (A)[0])) +\
|
|
(((uint32) ((uchar) (A)[1])) << 8) +\
|
|
(((uint32) ((uchar) (A)[2])) << 16))
|
|
#define uint4korr(A) (uint32) (((uint32) ((uchar) (A)[0])) +\
|
|
(((uint32) ((uchar) (A)[1])) << 8) +\
|
|
(((uint32) ((uchar) (A)[2])) << 16) +\
|
|
(((uint32) ((uchar) (A)[3])) << 24))
|
|
#define uint5korr(A) ((ulonglong)(((uint32) ((uchar) (A)[0])) +\
|
|
(((uint32) ((uchar) (A)[1])) << 8) +\
|
|
(((uint32) ((uchar) (A)[2])) << 16) +\
|
|
(((uint32) ((uchar) (A)[3])) << 24)) +\
|
|
(((ulonglong) ((uchar) (A)[4])) << 32))
|
|
#define uint6korr(A) ((ulonglong)(((uint32) ((uchar) (A)[0])) + \
|
|
(((uint32) ((uchar) (A)[1])) << 8) + \
|
|
(((uint32) ((uchar) (A)[2])) << 16) + \
|
|
(((uint32) ((uchar) (A)[3])) << 24)) + \
|
|
(((ulonglong) ((uchar) (A)[4])) << 32) + \
|
|
(((ulonglong) ((uchar) (A)[5])) << 40))
|
|
#define uint8korr(A) ((ulonglong)(((uint32) ((uchar) (A)[0])) +\
|
|
(((uint32) ((uchar) (A)[1])) << 8) +\
|
|
(((uint32) ((uchar) (A)[2])) << 16) +\
|
|
(((uint32) ((uchar) (A)[3])) << 24)) +\
|
|
(((ulonglong) (((uint32) ((uchar) (A)[4])) +\
|
|
(((uint32) ((uchar) (A)[5])) << 8) +\
|
|
(((uint32) ((uchar) (A)[6])) << 16) +\
|
|
(((uint32) ((uchar) (A)[7])) << 24))) <<\
|
|
32))
|
|
#define int2store(T,A) do { uint def_temp= (uint) (A) ;\
|
|
*((uchar*) (T))= (uchar)(def_temp); \
|
|
*((uchar*) (T)+1)=(uchar)((def_temp >> 8)); \
|
|
} while(0)
|
|
#define int3store(T,A) do { /*lint -save -e734 */\
|
|
*((uchar*)(T))=(uchar) ((A));\
|
|
*((uchar*) (T)+1)=(uchar) (((A) >> 8));\
|
|
*((uchar*)(T)+2)=(uchar) (((A) >> 16)); \
|
|
/*lint -restore */} while(0)
|
|
#define int4store(T,A) do { *((char *)(T))=(char) ((A));\
|
|
*(((char *)(T))+1)=(char) (((A) >> 8));\
|
|
*(((char *)(T))+2)=(char) (((A) >> 16));\
|
|
*(((char *)(T))+3)=(char) (((A) >> 24)); } while(0)
|
|
#define int5store(T,A) do { *((char *)(T))=((A));\
|
|
*(((char *)(T))+1)=(((A) >> 8));\
|
|
*(((char *)(T))+2)=(((A) >> 16));\
|
|
*(((char *)(T))+3)=(((A) >> 24)); \
|
|
*(((char *)(T))+4)=(((A) >> 32)); } while(0)
|
|
#define int6store(T,A) do { *((char *)(T))=((A));\
|
|
*(((char *)(T))+1)=(((A) >> 8)); \
|
|
*(((char *)(T))+2)=(((A) >> 16)); \
|
|
*(((char *)(T))+3)=(((A) >> 24)); \
|
|
*(((char *)(T))+4)=(((A) >> 32)); \
|
|
*(((char *)(T))+5)=(((A) >> 40)); } while(0)
|
|
#define int8store(T,A) do { uint def_temp= (uint) (A), def_temp2= (uint) ((A) >> 32); \
|
|
int4store((T),def_temp); \
|
|
int4store((T+4),def_temp2); } while(0)
|
|
#ifdef WORDS_BIGENDIAN
|
|
#define float4store(T,A) do { *(T)= ((byte *) &A)[3];\
|
|
*((T)+1)=(char) ((byte *) &A)[2];\
|
|
*((T)+2)=(char) ((byte *) &A)[1];\
|
|
*((T)+3)=(char) ((byte *) &A)[0]; } while(0)
|
|
|
|
#define float4get(V,M) do { float def_temp;\
|
|
((byte*) &def_temp)[0]=(M)[3];\
|
|
((byte*) &def_temp)[1]=(M)[2];\
|
|
((byte*) &def_temp)[2]=(M)[1];\
|
|
((byte*) &def_temp)[3]=(M)[0];\
|
|
(V)=def_temp; } while(0)
|
|
#define float8store(T,V) do { *(T)= ((byte *) &V)[7];\
|
|
*((T)+1)=(char) ((byte *) &V)[6];\
|
|
*((T)+2)=(char) ((byte *) &V)[5];\
|
|
*((T)+3)=(char) ((byte *) &V)[4];\
|
|
*((T)+4)=(char) ((byte *) &V)[3];\
|
|
*((T)+5)=(char) ((byte *) &V)[2];\
|
|
*((T)+6)=(char) ((byte *) &V)[1];\
|
|
*((T)+7)=(char) ((byte *) &V)[0]; } while(0)
|
|
|
|
#define float8get(V,M) do { double def_temp;\
|
|
((byte*) &def_temp)[0]=(M)[7];\
|
|
((byte*) &def_temp)[1]=(M)[6];\
|
|
((byte*) &def_temp)[2]=(M)[5];\
|
|
((byte*) &def_temp)[3]=(M)[4];\
|
|
((byte*) &def_temp)[4]=(M)[3];\
|
|
((byte*) &def_temp)[5]=(M)[2];\
|
|
((byte*) &def_temp)[6]=(M)[1];\
|
|
((byte*) &def_temp)[7]=(M)[0];\
|
|
(V) = def_temp; } while(0)
|
|
#else
|
|
#define float4get(V,M) memcpy_fixed((byte*) &V,(byte*) (M),sizeof(float))
|
|
#define float4store(V,M) memcpy_fixed((byte*) V,(byte*) (&M),sizeof(float))
|
|
|
|
#if defined(__FLOAT_WORD_ORDER) && (__FLOAT_WORD_ORDER == __BIG_ENDIAN)
|
|
#define doublestore(T,V) do { *(((char*)T)+0)=(char) ((byte *) &V)[4];\
|
|
*(((char*)T)+1)=(char) ((byte *) &V)[5];\
|
|
*(((char*)T)+2)=(char) ((byte *) &V)[6];\
|
|
*(((char*)T)+3)=(char) ((byte *) &V)[7];\
|
|
*(((char*)T)+4)=(char) ((byte *) &V)[0];\
|
|
*(((char*)T)+5)=(char) ((byte *) &V)[1];\
|
|
*(((char*)T)+6)=(char) ((byte *) &V)[2];\
|
|
*(((char*)T)+7)=(char) ((byte *) &V)[3]; }\
|
|
while(0)
|
|
#define doubleget(V,M) do { double def_temp;\
|
|
((byte*) &def_temp)[0]=(M)[4];\
|
|
((byte*) &def_temp)[1]=(M)[5];\
|
|
((byte*) &def_temp)[2]=(M)[6];\
|
|
((byte*) &def_temp)[3]=(M)[7];\
|
|
((byte*) &def_temp)[4]=(M)[0];\
|
|
((byte*) &def_temp)[5]=(M)[1];\
|
|
((byte*) &def_temp)[6]=(M)[2];\
|
|
((byte*) &def_temp)[7]=(M)[3];\
|
|
(V) = def_temp; } while(0)
|
|
#endif /* __FLOAT_WORD_ORDER */
|
|
|
|
#define float8get(V,M) doubleget((V),(M))
|
|
#define float8store(V,M) doublestore((V),(M))
|
|
#endif /* WORDS_BIGENDIAN */
|
|
|
|
#endif /* sint2korr */
|
|
|
|
/*
|
|
Macro for reading 32-bit integer from network byte order (big-endian)
|
|
from unaligned memory location.
|
|
*/
|
|
#define int4net(A) (int32) (((uint32) ((uchar) (A)[3])) |\
|
|
(((uint32) ((uchar) (A)[2])) << 8) |\
|
|
(((uint32) ((uchar) (A)[1])) << 16) |\
|
|
(((uint32) ((uchar) (A)[0])) << 24))
|
|
/*
|
|
Define-funktions for reading and storing in machine format from/to
|
|
short/long to/from some place in memory V should be a (not
|
|
register) variable, M is a pointer to byte
|
|
*/
|
|
|
|
#ifdef WORDS_BIGENDIAN
|
|
|
|
#define ushortget(V,M) do { V = (uint16) (((uint16) ((uchar) (M)[1]))+\
|
|
((uint16) ((uint16) (M)[0]) << 8)); } while(0)
|
|
#define shortget(V,M) do { V = (short) (((short) ((uchar) (M)[1]))+\
|
|
((short) ((short) (M)[0]) << 8)); } while(0)
|
|
#define longget(V,M) do { int32 def_temp;\
|
|
((byte*) &def_temp)[0]=(M)[0];\
|
|
((byte*) &def_temp)[1]=(M)[1];\
|
|
((byte*) &def_temp)[2]=(M)[2];\
|
|
((byte*) &def_temp)[3]=(M)[3];\
|
|
(V)=def_temp; } while(0)
|
|
#define ulongget(V,M) do { uint32 def_temp;\
|
|
((byte*) &def_temp)[0]=(M)[0];\
|
|
((byte*) &def_temp)[1]=(M)[1];\
|
|
((byte*) &def_temp)[2]=(M)[2];\
|
|
((byte*) &def_temp)[3]=(M)[3];\
|
|
(V)=def_temp; } while(0)
|
|
#define shortstore(T,A) do { uint def_temp=(uint) (A) ;\
|
|
*(((char*)T)+1)=(char)(def_temp); \
|
|
*(((char*)T)+0)=(char)(def_temp >> 8); } while(0)
|
|
#define longstore(T,A) do { *(((char*)T)+3)=((A));\
|
|
*(((char*)T)+2)=(((A) >> 8));\
|
|
*(((char*)T)+1)=(((A) >> 16));\
|
|
*(((char*)T)+0)=(((A) >> 24)); } while(0)
|
|
|
|
#define floatget(V,M) memcpy_fixed((byte*) &V,(byte*) (M),sizeof(float))
|
|
#define floatstore(T,V) memcpy_fixed((byte*) (T),(byte*)(&V),sizeof(float))
|
|
#define doubleget(V,M) memcpy_fixed((byte*) &V,(byte*) (M),sizeof(double))
|
|
#define doublestore(T,V) memcpy_fixed((byte*) (T),(byte*) &V,sizeof(double))
|
|
#define longlongget(V,M) memcpy_fixed((byte*) &V,(byte*) (M),sizeof(ulonglong))
|
|
#define longlongstore(T,V) memcpy_fixed((byte*) (T),(byte*) &V,sizeof(ulonglong))
|
|
|
|
#else
|
|
|
|
#define ushortget(V,M) do { V = uint2korr(M); } while(0)
|
|
#define shortget(V,M) do { V = sint2korr(M); } while(0)
|
|
#define longget(V,M) do { V = sint4korr(M); } while(0)
|
|
#define ulongget(V,M) do { V = uint4korr(M); } while(0)
|
|
#define shortstore(T,V) int2store(T,V)
|
|
#define longstore(T,V) int4store(T,V)
|
|
#ifndef floatstore
|
|
#define floatstore(T,V) memcpy_fixed((byte*) (T),(byte*) (&V),sizeof(float))
|
|
#define floatget(V,M) memcpy_fixed((byte*) &V, (byte*) (M), sizeof(float))
|
|
#endif
|
|
#ifndef doubleget
|
|
#define doubleget(V,M) memcpy_fixed((byte*) &V,(byte*) (M),sizeof(double))
|
|
#define doublestore(T,V) memcpy_fixed((byte*) (T),(byte*) &V,sizeof(double))
|
|
#endif /* doubleget */
|
|
#define longlongget(V,M) memcpy_fixed((byte*) &V,(byte*) (M),sizeof(ulonglong))
|
|
#define longlongstore(T,V) memcpy_fixed((byte*) (T),(byte*) &V,sizeof(ulonglong))
|
|
|
|
#endif /* WORDS_BIGENDIAN */
|
|
|
|
/* sprintf does not always return the number of bytes :- */
|
|
#ifdef SPRINTF_RETURNS_INT
|
|
#define my_sprintf(buff,args) sprintf args
|
|
#else
|
|
#ifdef SPRINTF_RETURNS_PTR
|
|
#define my_sprintf(buff,args) ((int)(sprintf args - buff))
|
|
#else
|
|
#define my_sprintf(buff,args) ((ulong) sprintf args, (ulong) strlen(buff))
|
|
#endif
|
|
#endif
|
|
|
|
#ifndef THREAD
|
|
#define thread_safe_increment(V,L) (V)++
|
|
#define thread_safe_add(V,C,L) (V)+=(C)
|
|
#define thread_safe_sub(V,C,L) (V)-=(C)
|
|
#define statistic_increment(V,L) (V)++
|
|
#define statistic_add(V,C,L) (V)+=(C)
|
|
#endif
|
|
|
|
#ifdef HAVE_CHARSET_utf8
|
|
#define MYSQL_UNIVERSAL_CLIENT_CHARSET "utf8"
|
|
#else
|
|
#define MYSQL_UNIVERSAL_CLIENT_CHARSET MYSQL_DEFAULT_CHARSET_NAME
|
|
#endif
|
|
|
|
#if defined(EMBEDDED_LIBRARY) && !defined(HAVE_EMBEDDED_PRIVILEGE_CONTROL)
|
|
#define NO_EMBEDDED_ACCESS_CHECKS
|
|
#endif
|
|
|
|
#ifdef HAVE_DLOPEN
|
|
#if defined(__WIN__)
|
|
#define dlsym(lib, name) GetProcAddress((HMODULE)lib, name)
|
|
#define dlopen(libname, unused) LoadLibraryEx(libname, NULL, 0)
|
|
#define dlclose(lib) FreeLibrary((HMODULE)lib)
|
|
#elif defined(HAVE_DLFCN_H)
|
|
#include <dlfcn.h>
|
|
#endif
|
|
#endif
|
|
|
|
/* FreeBSD 2.2.2 does not define RTLD_NOW) */
|
|
#ifndef RTLD_NOW
|
|
#define RTLD_NOW 1
|
|
#endif
|
|
|
|
#ifndef HAVE_DLERROR
|
|
#define dlerror() ""
|
|
#endif
|
|
|
|
#endif /* my_global_h */
|