mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 20:12:31 +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
1695 lines
51 KiB
C
1695 lines
51 KiB
C
/* Copyright (C) 2000 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 */
|
|
|
|
/*
|
|
Read and write locks for Posix threads. All tread must acquire
|
|
all locks it needs through thr_multi_lock() to avoid dead-locks.
|
|
A lock consists of a master lock (THR_LOCK), and lock instances
|
|
(THR_LOCK_DATA).
|
|
Any thread can have any number of lock instances (read and write:s) on
|
|
any lock. All lock instances must be freed.
|
|
Locks are prioritized according to:
|
|
|
|
The current lock types are:
|
|
|
|
TL_READ # Low priority read
|
|
TL_READ_WITH_SHARED_LOCKS
|
|
TL_READ_HIGH_PRIORITY # High priority read
|
|
TL_READ_NO_INSERT # Read without concurrent inserts
|
|
TL_WRITE_ALLOW_WRITE # Write lock that allows other writers
|
|
TL_WRITE_ALLOW_READ # Write lock, but allow reading
|
|
TL_WRITE_CONCURRENT_INSERT
|
|
# Insert that can be mixed when selects
|
|
TL_WRITE_DELAYED # Used by delayed insert
|
|
# Allows lower locks to take over
|
|
TL_WRITE_LOW_PRIORITY # Low priority write
|
|
TL_WRITE # High priority write
|
|
TL_WRITE_ONLY # High priority write
|
|
# Abort all new lock request with an error
|
|
|
|
Locks are prioritized according to:
|
|
|
|
WRITE_ALLOW_WRITE, WRITE_ALLOW_READ, WRITE_CONCURRENT_INSERT, WRITE_DELAYED,
|
|
WRITE_LOW_PRIORITY, READ, WRITE, READ_HIGH_PRIORITY and WRITE_ONLY
|
|
|
|
Locks in the same privilege level are scheduled in first-in-first-out order.
|
|
|
|
To allow concurrent read/writes locks, with 'WRITE_CONCURRENT_INSERT' one
|
|
should put a pointer to the following functions in the lock structure:
|
|
(If the pointer is zero (default), the function is not called)
|
|
|
|
check_status:
|
|
Before giving a lock of type TL_WRITE_CONCURRENT_INSERT,
|
|
we check if this function exists and returns 0.
|
|
If not, then the lock is upgraded to TL_WRITE_LOCK
|
|
In MyISAM this is a simple check if the insert can be done
|
|
at the end of the datafile.
|
|
update_status:
|
|
Before a write lock is released, this function is called.
|
|
In MyISAM this functions updates the count and length of the datafile
|
|
get_status:
|
|
When one gets a lock this functions is called.
|
|
In MyISAM this stores the number of rows and size of the datafile
|
|
for concurrent reads.
|
|
|
|
The lock algorithm allows one to have one TL_WRITE_ALLOW_READ,
|
|
TL_WRITE_CONCURRENT_INSERT or one TL_WRITE_DELAYED lock at the same time as
|
|
multiple read locks.
|
|
|
|
*/
|
|
|
|
#if !defined(MAIN) && !defined(DBUG_OFF) && !defined(EXTRA_DEBUG)
|
|
#define FORCE_DBUG_OFF
|
|
#endif
|
|
|
|
#include "mysys_priv.h"
|
|
|
|
#ifdef THREAD
|
|
#include "thr_lock.h"
|
|
#include <m_string.h>
|
|
#include <errno.h>
|
|
|
|
my_bool thr_lock_inited=0;
|
|
ulong locks_immediate = 0L, locks_waited = 0L;
|
|
ulong table_lock_wait_timeout;
|
|
enum thr_lock_type thr_upgraded_concurrent_insert_lock = TL_WRITE;
|
|
|
|
/* The following constants are only for debug output */
|
|
#define MAX_THREADS 100
|
|
#define MAX_LOCKS 100
|
|
|
|
|
|
LIST *thr_lock_thread_list; /* List of threads in use */
|
|
ulong max_write_lock_count= ~(ulong) 0L;
|
|
|
|
static inline pthread_cond_t *get_cond(void)
|
|
{
|
|
return &my_thread_var->suspend;
|
|
}
|
|
|
|
/*
|
|
** For the future (now the thread specific cond is alloced by my_pthread.c)
|
|
*/
|
|
|
|
my_bool init_thr_lock()
|
|
{
|
|
thr_lock_inited=1;
|
|
return 0;
|
|
}
|
|
|
|
static inline my_bool
|
|
thr_lock_owner_equal(THR_LOCK_OWNER *rhs, THR_LOCK_OWNER *lhs)
|
|
{
|
|
return rhs == lhs;
|
|
}
|
|
|
|
|
|
#ifdef EXTRA_DEBUG
|
|
#define MAX_FOUND_ERRORS 10 /* Report 10 first errors */
|
|
static uint found_errors=0;
|
|
|
|
static int check_lock(struct st_lock_list *list, const char* lock_type,
|
|
const char *where, my_bool same_owner, bool no_cond)
|
|
{
|
|
THR_LOCK_DATA *data,**prev;
|
|
uint count=0;
|
|
THR_LOCK_OWNER *first_owner;
|
|
LINT_INIT(first_owner);
|
|
|
|
prev= &list->data;
|
|
if (list->data)
|
|
{
|
|
enum thr_lock_type last_lock_type=list->data->type;
|
|
|
|
if (same_owner && list->data)
|
|
first_owner= list->data->owner;
|
|
for (data=list->data; data && count++ < MAX_LOCKS ; data=data->next)
|
|
{
|
|
if (data->type != last_lock_type)
|
|
last_lock_type=TL_IGNORE;
|
|
if (data->prev != prev)
|
|
{
|
|
fprintf(stderr,
|
|
"Warning: prev link %d didn't point at previous lock at %s: %s\n",
|
|
count, lock_type, where);
|
|
return 1;
|
|
}
|
|
if (same_owner &&
|
|
!thr_lock_owner_equal(data->owner, first_owner) &&
|
|
last_lock_type != TL_WRITE_ALLOW_WRITE)
|
|
{
|
|
fprintf(stderr,
|
|
"Warning: Found locks from different threads in %s: %s\n",
|
|
lock_type,where);
|
|
return 1;
|
|
}
|
|
if (no_cond && data->cond)
|
|
{
|
|
fprintf(stderr,
|
|
"Warning: Found active lock with not reset cond %s: %s\n",
|
|
lock_type,where);
|
|
return 1;
|
|
}
|
|
prev= &data->next;
|
|
}
|
|
if (data)
|
|
{
|
|
fprintf(stderr,"Warning: found too many locks at %s: %s\n",
|
|
lock_type,where);
|
|
return 1;
|
|
}
|
|
}
|
|
if (prev != list->last)
|
|
{
|
|
fprintf(stderr,"Warning: last didn't point at last lock at %s: %s\n",
|
|
lock_type, where);
|
|
return 1;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
|
|
static void check_locks(THR_LOCK *lock, const char *where,
|
|
my_bool allow_no_locks)
|
|
{
|
|
uint old_found_errors=found_errors;
|
|
DBUG_ENTER("check_locks");
|
|
|
|
if (found_errors < MAX_FOUND_ERRORS)
|
|
{
|
|
if (check_lock(&lock->write,"write",where,1,1) |
|
|
check_lock(&lock->write_wait,"write_wait",where,0,0) |
|
|
check_lock(&lock->read,"read",where,0,1) |
|
|
check_lock(&lock->read_wait,"read_wait",where,0,0))
|
|
found_errors++;
|
|
|
|
if (found_errors < MAX_FOUND_ERRORS)
|
|
{
|
|
uint count=0;
|
|
THR_LOCK_DATA *data;
|
|
for (data=lock->read.data ; data ; data=data->next)
|
|
{
|
|
if ((int) data->type == (int) TL_READ_NO_INSERT)
|
|
count++;
|
|
/* Protect against infinite loop. */
|
|
DBUG_ASSERT(count <= lock->read_no_write_count);
|
|
}
|
|
if (count != lock->read_no_write_count)
|
|
{
|
|
found_errors++;
|
|
fprintf(stderr,
|
|
"Warning at '%s': Locks read_no_write_count was %u when it should have been %u\n", where, lock->read_no_write_count,count);
|
|
}
|
|
|
|
if (!lock->write.data)
|
|
{
|
|
if (!allow_no_locks && !lock->read.data &&
|
|
(lock->write_wait.data || lock->read_wait.data))
|
|
{
|
|
found_errors++;
|
|
fprintf(stderr,
|
|
"Warning at '%s': No locks in use but locks are in wait queue\n",
|
|
where);
|
|
}
|
|
if (!lock->write_wait.data)
|
|
{
|
|
if (!allow_no_locks && lock->read_wait.data)
|
|
{
|
|
found_errors++;
|
|
fprintf(stderr,
|
|
"Warning at '%s': No write locks and waiting read locks\n",
|
|
where);
|
|
}
|
|
}
|
|
else
|
|
{
|
|
if (!allow_no_locks &&
|
|
(((lock->write_wait.data->type == TL_WRITE_CONCURRENT_INSERT ||
|
|
lock->write_wait.data->type == TL_WRITE_ALLOW_WRITE) &&
|
|
!lock->read_no_write_count) ||
|
|
lock->write_wait.data->type == TL_WRITE_ALLOW_READ ||
|
|
(lock->write_wait.data->type == TL_WRITE_DELAYED &&
|
|
!lock->read.data)))
|
|
{
|
|
found_errors++;
|
|
fprintf(stderr,
|
|
"Warning at '%s': Write lock %d waiting while no exclusive read locks\n",where,(int) lock->write_wait.data->type);
|
|
}
|
|
}
|
|
}
|
|
else
|
|
{ /* Have write lock */
|
|
if (lock->write_wait.data)
|
|
{
|
|
if (!allow_no_locks &&
|
|
lock->write.data->type == TL_WRITE_ALLOW_WRITE &&
|
|
lock->write_wait.data->type == TL_WRITE_ALLOW_WRITE)
|
|
{
|
|
found_errors++;
|
|
fprintf(stderr,
|
|
"Warning at '%s': Found WRITE_ALLOW_WRITE lock waiting for WRITE_ALLOW_WRITE lock\n",
|
|
where);
|
|
}
|
|
}
|
|
if (lock->read.data)
|
|
{
|
|
if (!thr_lock_owner_equal(lock->write.data->owner,
|
|
lock->read.data->owner) &&
|
|
((lock->write.data->type > TL_WRITE_DELAYED &&
|
|
lock->write.data->type != TL_WRITE_ONLY) ||
|
|
((lock->write.data->type == TL_WRITE_CONCURRENT_INSERT ||
|
|
lock->write.data->type == TL_WRITE_ALLOW_WRITE) &&
|
|
lock->read_no_write_count)))
|
|
{
|
|
found_errors++;
|
|
fprintf(stderr,
|
|
"Warning at '%s': Found lock of type %d that is write and read locked\n",
|
|
where, lock->write.data->type);
|
|
DBUG_PRINT("warning",("At '%s': Found lock of type %d that is write and read locked\n",
|
|
where, lock->write.data->type));
|
|
|
|
}
|
|
}
|
|
if (lock->read_wait.data)
|
|
{
|
|
if (!allow_no_locks && lock->write.data->type <= TL_WRITE_DELAYED &&
|
|
lock->read_wait.data->type <= TL_READ_HIGH_PRIORITY)
|
|
{
|
|
found_errors++;
|
|
fprintf(stderr,
|
|
"Warning at '%s': Found read lock of type %d waiting for write lock of type %d\n",
|
|
where,
|
|
(int) lock->read_wait.data->type,
|
|
(int) lock->write.data->type);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if (found_errors != old_found_errors)
|
|
{
|
|
DBUG_PRINT("error",("Found wrong lock"));
|
|
}
|
|
}
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
|
|
#else /* EXTRA_DEBUG */
|
|
#define check_locks(A,B,C)
|
|
#endif
|
|
|
|
|
|
/* Initialize a lock */
|
|
|
|
void thr_lock_init(THR_LOCK *lock)
|
|
{
|
|
DBUG_ENTER("thr_lock_init");
|
|
bzero((char*) lock,sizeof(*lock));
|
|
VOID(pthread_mutex_init(&lock->mutex,MY_MUTEX_INIT_FAST));
|
|
lock->read.last= &lock->read.data;
|
|
lock->read_wait.last= &lock->read_wait.data;
|
|
lock->write_wait.last= &lock->write_wait.data;
|
|
lock->write.last= &lock->write.data;
|
|
|
|
pthread_mutex_lock(&THR_LOCK_lock); /* Add to locks in use */
|
|
lock->list.data=(void*) lock;
|
|
thr_lock_thread_list=list_add(thr_lock_thread_list,&lock->list);
|
|
pthread_mutex_unlock(&THR_LOCK_lock);
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
|
|
|
|
void thr_lock_delete(THR_LOCK *lock)
|
|
{
|
|
DBUG_ENTER("thr_lock_delete");
|
|
VOID(pthread_mutex_destroy(&lock->mutex));
|
|
pthread_mutex_lock(&THR_LOCK_lock);
|
|
thr_lock_thread_list=list_delete(thr_lock_thread_list,&lock->list);
|
|
pthread_mutex_unlock(&THR_LOCK_lock);
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
|
|
|
|
void thr_lock_info_init(THR_LOCK_INFO *info)
|
|
{
|
|
info->thread= pthread_self();
|
|
info->thread_id= my_thread_id(); /* for debugging */
|
|
info->n_cursors= 0;
|
|
}
|
|
|
|
/* Initialize a lock instance */
|
|
|
|
void thr_lock_data_init(THR_LOCK *lock,THR_LOCK_DATA *data, void *param)
|
|
{
|
|
data->lock=lock;
|
|
data->type=TL_UNLOCK;
|
|
data->owner= 0; /* no owner yet */
|
|
data->status_param=param;
|
|
data->cond=0;
|
|
}
|
|
|
|
|
|
static inline my_bool
|
|
have_old_read_lock(THR_LOCK_DATA *data, THR_LOCK_OWNER *owner)
|
|
{
|
|
for ( ; data ; data=data->next)
|
|
{
|
|
if (thr_lock_owner_equal(data->owner, owner))
|
|
return 1; /* Already locked by thread */
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static inline my_bool have_specific_lock(THR_LOCK_DATA *data,
|
|
enum thr_lock_type type)
|
|
{
|
|
for ( ; data ; data=data->next)
|
|
{
|
|
if (data->type == type)
|
|
return 1;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
|
|
static enum enum_thr_lock_result
|
|
wait_for_lock(struct st_lock_list *wait, THR_LOCK_DATA *data,
|
|
my_bool in_wait_list)
|
|
{
|
|
struct st_my_thread_var *thread_var= my_thread_var;
|
|
pthread_cond_t *cond= &thread_var->suspend;
|
|
struct timespec wait_timeout;
|
|
enum enum_thr_lock_result result= THR_LOCK_ABORTED;
|
|
my_bool can_deadlock= test(data->owner->info->n_cursors);
|
|
|
|
if (!in_wait_list)
|
|
{
|
|
(*wait->last)=data; /* Wait for lock */
|
|
data->prev= wait->last;
|
|
wait->last= &data->next;
|
|
}
|
|
|
|
/* Set up control struct to allow others to abort locks */
|
|
thread_var->current_mutex= &data->lock->mutex;
|
|
thread_var->current_cond= cond;
|
|
data->cond= cond;
|
|
|
|
if (can_deadlock)
|
|
set_timespec(wait_timeout, table_lock_wait_timeout);
|
|
while (!thread_var->abort || in_wait_list)
|
|
{
|
|
int rc= (can_deadlock ?
|
|
pthread_cond_timedwait(cond, &data->lock->mutex,
|
|
&wait_timeout) :
|
|
pthread_cond_wait(cond, &data->lock->mutex));
|
|
/*
|
|
We must break the wait if one of the following occurs:
|
|
- the connection has been aborted (!thread_var->abort), but
|
|
this is not a delayed insert thread (in_wait_list). For a delayed
|
|
insert thread the proper action at shutdown is, apparently, to
|
|
acquire the lock and complete the insert.
|
|
- the lock has been granted (data->cond is set to NULL by the granter),
|
|
or the waiting has been aborted (additionally data->type is set to
|
|
TL_UNLOCK).
|
|
- the wait has timed out (rc == ETIMEDOUT)
|
|
Order of checks below is important to not report about timeout
|
|
if the predicate is true.
|
|
*/
|
|
if (data->cond == 0)
|
|
break;
|
|
if (rc == ETIMEDOUT || rc == ETIME)
|
|
{
|
|
result= THR_LOCK_WAIT_TIMEOUT;
|
|
break;
|
|
}
|
|
}
|
|
|
|
if (data->cond || data->type == TL_UNLOCK)
|
|
{
|
|
if (data->cond) /* aborted or timed out */
|
|
{
|
|
if (((*data->prev)=data->next)) /* remove from wait-list */
|
|
data->next->prev= data->prev;
|
|
else
|
|
wait->last=data->prev;
|
|
data->type= TL_UNLOCK; /* No lock */
|
|
}
|
|
check_locks(data->lock,"failed wait_for_lock",0);
|
|
}
|
|
else
|
|
{
|
|
result= THR_LOCK_SUCCESS;
|
|
statistic_increment(locks_waited, &THR_LOCK_lock);
|
|
if (data->lock->get_status)
|
|
(*data->lock->get_status)(data->status_param, 0);
|
|
check_locks(data->lock,"got wait_for_lock",0);
|
|
}
|
|
pthread_mutex_unlock(&data->lock->mutex);
|
|
|
|
/* The following must be done after unlock of lock->mutex */
|
|
pthread_mutex_lock(&thread_var->mutex);
|
|
thread_var->current_mutex= 0;
|
|
thread_var->current_cond= 0;
|
|
pthread_mutex_unlock(&thread_var->mutex);
|
|
return result;
|
|
}
|
|
|
|
|
|
enum enum_thr_lock_result
|
|
thr_lock(THR_LOCK_DATA *data, THR_LOCK_OWNER *owner,
|
|
enum thr_lock_type lock_type)
|
|
{
|
|
THR_LOCK *lock=data->lock;
|
|
enum enum_thr_lock_result result= THR_LOCK_SUCCESS;
|
|
struct st_lock_list *wait_queue;
|
|
THR_LOCK_DATA *lock_owner;
|
|
DBUG_ENTER("thr_lock");
|
|
|
|
data->next=0;
|
|
data->cond=0; /* safety */
|
|
data->type=lock_type;
|
|
data->owner= owner; /* Must be reset ! */
|
|
VOID(pthread_mutex_lock(&lock->mutex));
|
|
DBUG_PRINT("lock",("data: 0x%lx thread: 0x%lx lock: 0x%lx type: %d",
|
|
(long) data, data->owner->info->thread_id,
|
|
(long) lock, (int) lock_type));
|
|
check_locks(lock,(uint) lock_type <= (uint) TL_READ_NO_INSERT ?
|
|
"enter read_lock" : "enter write_lock",0);
|
|
if ((int) lock_type <= (int) TL_READ_NO_INSERT)
|
|
{
|
|
/* Request for READ lock */
|
|
if (lock->write.data)
|
|
{
|
|
/* We can allow a read lock even if there is already a write lock
|
|
on the table in one the following cases:
|
|
- This thread alread have a write lock on the table
|
|
- The write lock is TL_WRITE_ALLOW_READ or TL_WRITE_DELAYED
|
|
and the read lock is TL_READ_HIGH_PRIORITY or TL_READ
|
|
- The write lock is TL_WRITE_CONCURRENT_INSERT or TL_WRITE_ALLOW_WRITE
|
|
and the read lock is not TL_READ_NO_INSERT
|
|
*/
|
|
|
|
DBUG_PRINT("lock",("write locked by thread: 0x%lx",
|
|
lock->write.data->owner->info->thread_id));
|
|
if (thr_lock_owner_equal(data->owner, lock->write.data->owner) ||
|
|
(lock->write.data->type <= TL_WRITE_DELAYED &&
|
|
(((int) lock_type <= (int) TL_READ_HIGH_PRIORITY) ||
|
|
(lock->write.data->type != TL_WRITE_CONCURRENT_INSERT &&
|
|
lock->write.data->type != TL_WRITE_ALLOW_READ))))
|
|
{ /* Already got a write lock */
|
|
(*lock->read.last)=data; /* Add to running FIFO */
|
|
data->prev=lock->read.last;
|
|
lock->read.last= &data->next;
|
|
if (lock_type == TL_READ_NO_INSERT)
|
|
lock->read_no_write_count++;
|
|
check_locks(lock,"read lock with old write lock",0);
|
|
if (lock->get_status)
|
|
(*lock->get_status)(data->status_param, 0);
|
|
statistic_increment(locks_immediate,&THR_LOCK_lock);
|
|
goto end;
|
|
}
|
|
if (lock->write.data->type == TL_WRITE_ONLY)
|
|
{
|
|
/* We are not allowed to get a READ lock in this case */
|
|
data->type=TL_UNLOCK;
|
|
result= THR_LOCK_ABORTED; /* Can't wait for this one */
|
|
goto end;
|
|
}
|
|
}
|
|
else if (!lock->write_wait.data ||
|
|
lock->write_wait.data->type <= TL_WRITE_LOW_PRIORITY ||
|
|
lock_type == TL_READ_HIGH_PRIORITY ||
|
|
have_old_read_lock(lock->read.data, data->owner))
|
|
{ /* No important write-locks */
|
|
(*lock->read.last)=data; /* Add to running FIFO */
|
|
data->prev=lock->read.last;
|
|
lock->read.last= &data->next;
|
|
if (lock->get_status)
|
|
(*lock->get_status)(data->status_param, 0);
|
|
if (lock_type == TL_READ_NO_INSERT)
|
|
lock->read_no_write_count++;
|
|
check_locks(lock,"read lock with no write locks",0);
|
|
statistic_increment(locks_immediate,&THR_LOCK_lock);
|
|
goto end;
|
|
}
|
|
/*
|
|
We're here if there is an active write lock or no write
|
|
lock but a high priority write waiting in the write_wait queue.
|
|
In the latter case we should yield the lock to the writer.
|
|
*/
|
|
wait_queue= &lock->read_wait;
|
|
}
|
|
else /* Request for WRITE lock */
|
|
{
|
|
if (lock_type == TL_WRITE_DELAYED)
|
|
{
|
|
if (lock->write.data && lock->write.data->type == TL_WRITE_ONLY)
|
|
{
|
|
data->type=TL_UNLOCK;
|
|
result= THR_LOCK_ABORTED; /* Can't wait for this one */
|
|
goto end;
|
|
}
|
|
/*
|
|
if there is a TL_WRITE_ALLOW_READ lock, we have to wait for a lock
|
|
(TL_WRITE_ALLOW_READ is used for ALTER TABLE in MySQL)
|
|
*/
|
|
if ((!lock->write.data ||
|
|
lock->write.data->type != TL_WRITE_ALLOW_READ) &&
|
|
!have_specific_lock(lock->write_wait.data,TL_WRITE_ALLOW_READ) &&
|
|
(lock->write.data || lock->read.data))
|
|
{
|
|
/* Add delayed write lock to write_wait queue, and return at once */
|
|
(*lock->write_wait.last)=data;
|
|
data->prev=lock->write_wait.last;
|
|
lock->write_wait.last= &data->next;
|
|
data->cond=get_cond();
|
|
/*
|
|
We don't have to do get_status here as we will do it when we change
|
|
the delayed lock to a real write lock
|
|
*/
|
|
statistic_increment(locks_immediate,&THR_LOCK_lock);
|
|
goto end;
|
|
}
|
|
}
|
|
else if (lock_type == TL_WRITE_CONCURRENT_INSERT && ! lock->check_status)
|
|
data->type=lock_type= thr_upgraded_concurrent_insert_lock;
|
|
|
|
if (lock->write.data) /* If there is a write lock */
|
|
{
|
|
if (lock->write.data->type == TL_WRITE_ONLY)
|
|
{
|
|
/* We are not allowed to get a lock in this case */
|
|
data->type=TL_UNLOCK;
|
|
result= THR_LOCK_ABORTED; /* Can't wait for this one */
|
|
goto end;
|
|
}
|
|
|
|
/*
|
|
The following test will not work if the old lock was a
|
|
TL_WRITE_ALLOW_WRITE, TL_WRITE_ALLOW_READ or TL_WRITE_DELAYED in
|
|
the same thread, but this will never happen within MySQL.
|
|
*/
|
|
if (thr_lock_owner_equal(data->owner, lock->write.data->owner) ||
|
|
(lock_type == TL_WRITE_ALLOW_WRITE &&
|
|
!lock->write_wait.data &&
|
|
lock->write.data->type == TL_WRITE_ALLOW_WRITE))
|
|
{
|
|
/*
|
|
We have already got a write lock or all locks are
|
|
TL_WRITE_ALLOW_WRITE
|
|
*/
|
|
DBUG_PRINT("info", ("write_wait.data: 0x%lx old_type: %d",
|
|
(ulong) lock->write_wait.data,
|
|
lock->write.data->type));
|
|
|
|
(*lock->write.last)=data; /* Add to running fifo */
|
|
data->prev=lock->write.last;
|
|
lock->write.last= &data->next;
|
|
check_locks(lock,"second write lock",0);
|
|
if (data->lock->get_status)
|
|
(*data->lock->get_status)(data->status_param, 0);
|
|
statistic_increment(locks_immediate,&THR_LOCK_lock);
|
|
goto end;
|
|
}
|
|
DBUG_PRINT("lock",("write locked by thread: 0x%lx",
|
|
lock->write.data->owner->info->thread_id));
|
|
}
|
|
else
|
|
{
|
|
DBUG_PRINT("info", ("write_wait.data: 0x%lx",
|
|
(ulong) lock->write_wait.data));
|
|
if (!lock->write_wait.data)
|
|
{ /* no scheduled write locks */
|
|
my_bool concurrent_insert= 0;
|
|
if (lock_type == TL_WRITE_CONCURRENT_INSERT)
|
|
{
|
|
concurrent_insert= 1;
|
|
if ((*lock->check_status)(data->status_param))
|
|
{
|
|
concurrent_insert= 0;
|
|
data->type=lock_type= thr_upgraded_concurrent_insert_lock;
|
|
}
|
|
}
|
|
|
|
if (!lock->read.data ||
|
|
(lock_type <= TL_WRITE_DELAYED &&
|
|
((lock_type != TL_WRITE_CONCURRENT_INSERT &&
|
|
lock_type != TL_WRITE_ALLOW_WRITE) ||
|
|
!lock->read_no_write_count)))
|
|
{
|
|
(*lock->write.last)=data; /* Add as current write lock */
|
|
data->prev=lock->write.last;
|
|
lock->write.last= &data->next;
|
|
if (data->lock->get_status)
|
|
(*data->lock->get_status)(data->status_param, concurrent_insert);
|
|
check_locks(lock,"only write lock",0);
|
|
statistic_increment(locks_immediate,&THR_LOCK_lock);
|
|
goto end;
|
|
}
|
|
}
|
|
DBUG_PRINT("lock",("write locked by thread: 0x%lx, type: %d",
|
|
lock->read.data->owner->info->thread_id, data->type));
|
|
}
|
|
wait_queue= &lock->write_wait;
|
|
}
|
|
/*
|
|
Try to detect a trivial deadlock when using cursors: attempt to
|
|
lock a table that is already locked by an open cursor within the
|
|
same connection. lock_owner can be zero if we succumbed to a high
|
|
priority writer in the write_wait queue.
|
|
*/
|
|
lock_owner= lock->read.data ? lock->read.data : lock->write.data;
|
|
if (lock_owner && lock_owner->owner->info == owner->info)
|
|
{
|
|
result= THR_LOCK_DEADLOCK;
|
|
goto end;
|
|
}
|
|
/* Can't get lock yet; Wait for it */
|
|
DBUG_RETURN(wait_for_lock(wait_queue, data, 0));
|
|
end:
|
|
pthread_mutex_unlock(&lock->mutex);
|
|
DBUG_RETURN(result);
|
|
}
|
|
|
|
|
|
static inline void free_all_read_locks(THR_LOCK *lock,
|
|
bool using_concurrent_insert)
|
|
{
|
|
THR_LOCK_DATA *data=lock->read_wait.data;
|
|
|
|
check_locks(lock,"before freeing read locks",1);
|
|
|
|
/* move all locks from read_wait list to read list */
|
|
(*lock->read.last)=data;
|
|
data->prev=lock->read.last;
|
|
lock->read.last=lock->read_wait.last;
|
|
|
|
/* Clear read_wait list */
|
|
lock->read_wait.last= &lock->read_wait.data;
|
|
|
|
do
|
|
{
|
|
pthread_cond_t *cond=data->cond;
|
|
if ((int) data->type == (int) TL_READ_NO_INSERT)
|
|
{
|
|
if (using_concurrent_insert)
|
|
{
|
|
/*
|
|
We can't free this lock;
|
|
Link lock away from read chain back into read_wait chain
|
|
*/
|
|
if (((*data->prev)=data->next))
|
|
data->next->prev=data->prev;
|
|
else
|
|
lock->read.last=data->prev;
|
|
*lock->read_wait.last= data;
|
|
data->prev= lock->read_wait.last;
|
|
lock->read_wait.last= &data->next;
|
|
continue;
|
|
}
|
|
lock->read_no_write_count++;
|
|
}
|
|
DBUG_PRINT("lock",("giving read lock to thread: 0x%lx",
|
|
data->owner->info->thread_id));
|
|
data->cond=0; /* Mark thread free */
|
|
VOID(pthread_cond_signal(cond));
|
|
} while ((data=data->next));
|
|
*lock->read_wait.last=0;
|
|
if (!lock->read_wait.data)
|
|
lock->write_lock_count=0;
|
|
check_locks(lock,"after giving read locks",0);
|
|
}
|
|
|
|
/* Unlock lock and free next thread on same lock */
|
|
|
|
void thr_unlock(THR_LOCK_DATA *data)
|
|
{
|
|
THR_LOCK *lock=data->lock;
|
|
enum thr_lock_type lock_type=data->type;
|
|
DBUG_ENTER("thr_unlock");
|
|
DBUG_PRINT("lock",("data: 0x%lx thread: 0x%lx lock: 0x%lx",
|
|
(long) data, data->owner->info->thread_id, (long) lock));
|
|
pthread_mutex_lock(&lock->mutex);
|
|
check_locks(lock,"start of release lock",0);
|
|
|
|
if (((*data->prev)=data->next)) /* remove from lock-list */
|
|
data->next->prev= data->prev;
|
|
else if (lock_type <= TL_READ_NO_INSERT)
|
|
lock->read.last=data->prev;
|
|
else if (lock_type == TL_WRITE_DELAYED && data->cond)
|
|
{
|
|
/*
|
|
This only happens in extreme circumstances when a
|
|
write delayed lock that is waiting for a lock
|
|
*/
|
|
lock->write_wait.last=data->prev; /* Put it on wait queue */
|
|
}
|
|
else
|
|
lock->write.last=data->prev;
|
|
if (lock_type >= TL_WRITE_CONCURRENT_INSERT && lock->update_status)
|
|
(*lock->update_status)(data->status_param);
|
|
if (lock_type == TL_READ_NO_INSERT)
|
|
lock->read_no_write_count--;
|
|
data->type=TL_UNLOCK; /* Mark unlocked */
|
|
check_locks(lock,"after releasing lock",1);
|
|
|
|
if (!lock->write.data) /* If no active write locks */
|
|
{
|
|
data=lock->write_wait.data;
|
|
if (!lock->read.data) /* If no more locks in use */
|
|
{
|
|
/* Release write-locks with TL_WRITE or TL_WRITE_ONLY priority first */
|
|
if (data &&
|
|
(data->type != TL_WRITE_LOW_PRIORITY || !lock->read_wait.data ||
|
|
lock->read_wait.data->type < TL_READ_HIGH_PRIORITY))
|
|
{
|
|
if (lock->write_lock_count++ > max_write_lock_count)
|
|
{
|
|
/* Too many write locks in a row; Release all waiting read locks */
|
|
lock->write_lock_count=0;
|
|
if (lock->read_wait.data)
|
|
{
|
|
DBUG_PRINT("info",("Freeing all read_locks because of max_write_lock_count"));
|
|
free_all_read_locks(lock,0);
|
|
goto end;
|
|
}
|
|
}
|
|
for (;;)
|
|
{
|
|
if (((*data->prev)=data->next)) /* remove from wait-list */
|
|
data->next->prev= data->prev;
|
|
else
|
|
lock->write_wait.last=data->prev;
|
|
(*lock->write.last)=data; /* Put in execute list */
|
|
data->prev=lock->write.last;
|
|
data->next=0;
|
|
lock->write.last= &data->next;
|
|
if (data->type == TL_WRITE_CONCURRENT_INSERT &&
|
|
(*lock->check_status)(data->status_param))
|
|
data->type=TL_WRITE; /* Upgrade lock */
|
|
DBUG_PRINT("lock",("giving write lock of type %d to thread: 0x%lx",
|
|
data->type, data->owner->info->thread_id));
|
|
{
|
|
pthread_cond_t *cond=data->cond;
|
|
data->cond=0; /* Mark thread free */
|
|
VOID(pthread_cond_signal(cond)); /* Start waiting thread */
|
|
}
|
|
if (data->type != TL_WRITE_ALLOW_WRITE ||
|
|
!lock->write_wait.data ||
|
|
lock->write_wait.data->type != TL_WRITE_ALLOW_WRITE)
|
|
break;
|
|
data=lock->write_wait.data; /* Free this too */
|
|
}
|
|
if (data->type >= TL_WRITE_LOW_PRIORITY)
|
|
{
|
|
check_locks(lock,"giving write lock",0);
|
|
pthread_mutex_unlock(&lock->mutex);
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
/* Release possible read locks together with the write lock */
|
|
}
|
|
if (lock->read_wait.data)
|
|
free_all_read_locks(lock,
|
|
data &&
|
|
(data->type == TL_WRITE_CONCURRENT_INSERT ||
|
|
data->type == TL_WRITE_ALLOW_WRITE));
|
|
else
|
|
{
|
|
DBUG_PRINT("lock",("No waiting read locks to free"));
|
|
}
|
|
}
|
|
else if (data &&
|
|
(lock_type=data->type) <= TL_WRITE_DELAYED &&
|
|
((lock_type != TL_WRITE_CONCURRENT_INSERT &&
|
|
lock_type != TL_WRITE_ALLOW_WRITE) ||
|
|
!lock->read_no_write_count))
|
|
{
|
|
/*
|
|
For DELAYED, ALLOW_READ, WRITE_ALLOW_WRITE or CONCURRENT_INSERT locks
|
|
start WRITE locks together with the READ locks
|
|
*/
|
|
if (lock_type == TL_WRITE_CONCURRENT_INSERT &&
|
|
(*lock->check_status)(data->status_param))
|
|
{
|
|
data->type=TL_WRITE; /* Upgrade lock */
|
|
if (lock->read_wait.data)
|
|
free_all_read_locks(lock,0);
|
|
goto end;
|
|
}
|
|
do {
|
|
pthread_cond_t *cond=data->cond;
|
|
if (((*data->prev)=data->next)) /* remove from wait-list */
|
|
data->next->prev= data->prev;
|
|
else
|
|
lock->write_wait.last=data->prev;
|
|
(*lock->write.last)=data; /* Put in execute list */
|
|
data->prev=lock->write.last;
|
|
lock->write.last= &data->next;
|
|
data->next=0; /* Only one write lock */
|
|
data->cond=0; /* Mark thread free */
|
|
VOID(pthread_cond_signal(cond)); /* Start waiting thread */
|
|
} while (lock_type == TL_WRITE_ALLOW_WRITE &&
|
|
(data=lock->write_wait.data) &&
|
|
data->type == TL_WRITE_ALLOW_WRITE);
|
|
if (lock->read_wait.data)
|
|
free_all_read_locks(lock,
|
|
(lock_type == TL_WRITE_CONCURRENT_INSERT ||
|
|
lock_type == TL_WRITE_ALLOW_WRITE));
|
|
}
|
|
else if (!data && lock->read_wait.data)
|
|
free_all_read_locks(lock,0);
|
|
}
|
|
end:
|
|
check_locks(lock,"thr_unlock",0);
|
|
pthread_mutex_unlock(&lock->mutex);
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
|
|
|
|
/*
|
|
** Get all locks in a specific order to avoid dead-locks
|
|
** Sort acording to lock position and put write_locks before read_locks if
|
|
** lock on same lock.
|
|
*/
|
|
|
|
|
|
#define LOCK_CMP(A,B) ((byte*) (A->lock) - (uint) ((A)->type) < (byte*) (B->lock)- (uint) ((B)->type))
|
|
|
|
static void sort_locks(THR_LOCK_DATA **data,uint count)
|
|
{
|
|
THR_LOCK_DATA **pos,**end,**prev,*tmp;
|
|
|
|
/* Sort locks with insertion sort (fast because almost always few locks) */
|
|
|
|
for (pos=data+1,end=data+count; pos < end ; pos++)
|
|
{
|
|
tmp= *pos;
|
|
if (LOCK_CMP(tmp,pos[-1]))
|
|
{
|
|
prev=pos;
|
|
do {
|
|
prev[0]=prev[-1];
|
|
} while (--prev != data && LOCK_CMP(tmp,prev[-1]));
|
|
prev[0]=tmp;
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
enum enum_thr_lock_result
|
|
thr_multi_lock(THR_LOCK_DATA **data, uint count, THR_LOCK_OWNER *owner)
|
|
{
|
|
THR_LOCK_DATA **pos,**end;
|
|
DBUG_ENTER("thr_multi_lock");
|
|
DBUG_PRINT("lock",("data: 0x%lx count: %d", (long) data, count));
|
|
if (count > 1)
|
|
sort_locks(data,count);
|
|
/* lock everything */
|
|
for (pos=data,end=data+count; pos < end ; pos++)
|
|
{
|
|
enum enum_thr_lock_result result= thr_lock(*pos, owner, (*pos)->type);
|
|
if (result != THR_LOCK_SUCCESS)
|
|
{ /* Aborted */
|
|
thr_multi_unlock(data,(uint) (pos-data));
|
|
DBUG_RETURN(result);
|
|
}
|
|
#ifdef MAIN
|
|
printf("Thread: %s Got lock: 0x%lx type: %d\n",my_thread_name(),
|
|
(long) pos[0]->lock, pos[0]->type); fflush(stdout);
|
|
#endif
|
|
}
|
|
/*
|
|
Ensure that all get_locks() have the same status
|
|
If we lock the same table multiple times, we must use the same
|
|
status_param!
|
|
*/
|
|
#if !defined(DONT_USE_RW_LOCKS)
|
|
if (count > 1)
|
|
{
|
|
THR_LOCK_DATA *last_lock= end[-1];
|
|
pos=end-1;
|
|
do
|
|
{
|
|
pos--;
|
|
if (last_lock->lock == (*pos)->lock &&
|
|
last_lock->lock->copy_status)
|
|
{
|
|
if (last_lock->type <= TL_READ_NO_INSERT)
|
|
{
|
|
THR_LOCK_DATA **read_lock;
|
|
/*
|
|
If we are locking the same table with read locks we must ensure
|
|
that all tables share the status of the last write lock or
|
|
the same read lock.
|
|
*/
|
|
for (;
|
|
(*pos)->type <= TL_READ_NO_INSERT &&
|
|
pos != data &&
|
|
pos[-1]->lock == (*pos)->lock ;
|
|
pos--) ;
|
|
|
|
read_lock = pos+1;
|
|
do
|
|
{
|
|
(last_lock->lock->copy_status)((*read_lock)->status_param,
|
|
(*pos)->status_param);
|
|
} while (*(read_lock++) != last_lock);
|
|
last_lock= (*pos); /* Point at last write lock */
|
|
}
|
|
else
|
|
(*last_lock->lock->copy_status)((*pos)->status_param,
|
|
last_lock->status_param);
|
|
}
|
|
else
|
|
last_lock=(*pos);
|
|
} while (pos != data);
|
|
}
|
|
#endif
|
|
DBUG_RETURN(THR_LOCK_SUCCESS);
|
|
}
|
|
|
|
/* free all locks */
|
|
|
|
void thr_multi_unlock(THR_LOCK_DATA **data,uint count)
|
|
{
|
|
THR_LOCK_DATA **pos,**end;
|
|
DBUG_ENTER("thr_multi_unlock");
|
|
DBUG_PRINT("lock",("data: 0x%lx count: %d", (long) data, count));
|
|
|
|
for (pos=data,end=data+count; pos < end ; pos++)
|
|
{
|
|
#ifdef MAIN
|
|
printf("Thread: %s Rel lock: 0x%lx type: %d\n",
|
|
my_thread_name(), (long) pos[0]->lock, pos[0]->type);
|
|
fflush(stdout);
|
|
#endif
|
|
if ((*pos)->type != TL_UNLOCK)
|
|
thr_unlock(*pos);
|
|
else
|
|
{
|
|
DBUG_PRINT("lock",("Free lock: data: 0x%lx thread: %ld lock: 0x%lx",
|
|
(long) *pos, (*pos)->owner->info->thread_id,
|
|
(long) (*pos)->lock));
|
|
}
|
|
}
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
|
|
/*
|
|
Abort all threads waiting for a lock. The lock will be upgraded to
|
|
TL_WRITE_ONLY to abort any new accesses to the lock
|
|
*/
|
|
|
|
void thr_abort_locks(THR_LOCK *lock, bool upgrade_lock)
|
|
{
|
|
THR_LOCK_DATA *data;
|
|
DBUG_ENTER("thr_abort_locks");
|
|
pthread_mutex_lock(&lock->mutex);
|
|
|
|
for (data=lock->read_wait.data; data ; data=data->next)
|
|
{
|
|
data->type=TL_UNLOCK; /* Mark killed */
|
|
/* It's safe to signal the cond first: we're still holding the mutex. */
|
|
pthread_cond_signal(data->cond);
|
|
data->cond=0; /* Removed from list */
|
|
}
|
|
for (data=lock->write_wait.data; data ; data=data->next)
|
|
{
|
|
data->type=TL_UNLOCK;
|
|
pthread_cond_signal(data->cond);
|
|
data->cond=0;
|
|
}
|
|
lock->read_wait.last= &lock->read_wait.data;
|
|
lock->write_wait.last= &lock->write_wait.data;
|
|
lock->read_wait.data=lock->write_wait.data=0;
|
|
if (upgrade_lock && lock->write.data)
|
|
lock->write.data->type=TL_WRITE_ONLY;
|
|
pthread_mutex_unlock(&lock->mutex);
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
|
|
|
|
/*
|
|
Abort all locks for specific table/thread combination
|
|
|
|
This is used to abort all locks for a specific thread
|
|
*/
|
|
|
|
my_bool thr_abort_locks_for_thread(THR_LOCK *lock, pthread_t thread)
|
|
{
|
|
THR_LOCK_DATA *data;
|
|
my_bool found= FALSE;
|
|
DBUG_ENTER("thr_abort_locks_for_thread");
|
|
|
|
pthread_mutex_lock(&lock->mutex);
|
|
for (data= lock->read_wait.data; data ; data= data->next)
|
|
{
|
|
if (pthread_equal(thread, data->owner->info->thread))
|
|
{
|
|
DBUG_PRINT("info",("Aborting read-wait lock"));
|
|
data->type= TL_UNLOCK; /* Mark killed */
|
|
/* It's safe to signal the cond first: we're still holding the mutex. */
|
|
found= TRUE;
|
|
pthread_cond_signal(data->cond);
|
|
data->cond= 0; /* Removed from list */
|
|
|
|
if (((*data->prev)= data->next))
|
|
data->next->prev= data->prev;
|
|
else
|
|
lock->read_wait.last= data->prev;
|
|
}
|
|
}
|
|
for (data= lock->write_wait.data; data ; data= data->next)
|
|
{
|
|
if (pthread_equal(thread, data->owner->info->thread))
|
|
{
|
|
DBUG_PRINT("info",("Aborting write-wait lock"));
|
|
data->type= TL_UNLOCK;
|
|
found= TRUE;
|
|
pthread_cond_signal(data->cond);
|
|
data->cond= 0;
|
|
|
|
if (((*data->prev)= data->next))
|
|
data->next->prev= data->prev;
|
|
else
|
|
lock->write_wait.last= data->prev;
|
|
}
|
|
}
|
|
pthread_mutex_unlock(&lock->mutex);
|
|
DBUG_RETURN(found);
|
|
}
|
|
|
|
|
|
/*
|
|
Downgrade a WRITE_* to a lower WRITE level
|
|
SYNOPSIS
|
|
thr_downgrade_write_lock()
|
|
in_data Lock data of thread downgrading its lock
|
|
new_lock_type New write lock type
|
|
RETURN VALUE
|
|
NONE
|
|
DESCRIPTION
|
|
This can be used to downgrade a lock already owned. When the downgrade
|
|
occurs also other waiters, both readers and writers can be allowed to
|
|
start.
|
|
The previous lock is often TL_WRITE_ONLY but can also be
|
|
TL_WRITE and TL_WRITE_ALLOW_READ. The normal downgrade variants are
|
|
TL_WRITE_ONLY => TL_WRITE_ALLOW_READ After a short exclusive lock
|
|
TL_WRITE_ALLOW_READ => TL_WRITE_ALLOW_WRITE After discovering that the
|
|
operation didn't need such a high lock.
|
|
TL_WRITE_ONLY => TL_WRITE after a short exclusive lock while holding a
|
|
write table lock
|
|
TL_WRITE_ONLY => TL_WRITE_ALLOW_WRITE After a short exclusive lock after
|
|
already earlier having dongraded lock to TL_WRITE_ALLOW_WRITE
|
|
The implementation is conservative and rather don't start rather than
|
|
go on unknown paths to start, the common cases are handled.
|
|
|
|
NOTE:
|
|
In its current implementation it is only allowed to downgrade from
|
|
TL_WRITE_ONLY. In this case there are no waiters. Thus no wake up
|
|
logic is required.
|
|
*/
|
|
|
|
void thr_downgrade_write_lock(THR_LOCK_DATA *in_data,
|
|
enum thr_lock_type new_lock_type)
|
|
{
|
|
THR_LOCK *lock=in_data->lock;
|
|
enum thr_lock_type old_lock_type= in_data->type;
|
|
#ifdef TO_BE_REMOVED
|
|
THR_LOCK_DATA *data, *next;
|
|
bool start_writers= FALSE;
|
|
bool start_readers= FALSE;
|
|
#endif
|
|
DBUG_ENTER("thr_downgrade_write_only_lock");
|
|
|
|
pthread_mutex_lock(&lock->mutex);
|
|
DBUG_ASSERT(old_lock_type == TL_WRITE_ONLY);
|
|
DBUG_ASSERT(old_lock_type > new_lock_type);
|
|
in_data->type= new_lock_type;
|
|
check_locks(lock,"after downgrading lock",0);
|
|
|
|
#if TO_BE_REMOVED
|
|
switch (old_lock_type)
|
|
{
|
|
case TL_WRITE_ONLY:
|
|
case TL_WRITE:
|
|
case TL_WRITE_LOW_PRIORITY:
|
|
/*
|
|
Previous lock was exclusive we are now ready to start up most waiting
|
|
threads.
|
|
*/
|
|
switch (new_lock_type)
|
|
{
|
|
case TL_WRITE_ALLOW_READ:
|
|
/* Still cannot start WRITE operations. Can only start readers. */
|
|
start_readers= TRUE;
|
|
break;
|
|
case TL_WRITE:
|
|
case TL_WRITE_LOW_PRIORITY:
|
|
/*
|
|
Still cannot start anything, but new requests are no longer
|
|
aborted.
|
|
*/
|
|
break;
|
|
case TL_WRITE_ALLOW_WRITE:
|
|
/*
|
|
We can start both writers and readers.
|
|
*/
|
|
start_writers= TRUE;
|
|
start_readers= TRUE;
|
|
break;
|
|
case TL_WRITE_CONCURRENT_INSERT:
|
|
case TL_WRITE_DELAYED:
|
|
/*
|
|
This routine is not designed for those. Lock will be downgraded
|
|
but no start of waiters will occur. This is not the optimal but
|
|
should be a correct behaviour.
|
|
*/
|
|
break;
|
|
default:
|
|
DBUG_ASSERT(0);
|
|
}
|
|
break;
|
|
case TL_WRITE_DELAYED:
|
|
case TL_WRITE_CONCURRENT_INSERT:
|
|
/*
|
|
This routine is not designed for those. Lock will be downgraded
|
|
but no start of waiters will occur. This is not the optimal but
|
|
should be a correct behaviour.
|
|
*/
|
|
break;
|
|
case TL_WRITE_ALLOW_READ:
|
|
DBUG_ASSERT(new_lock_type == TL_WRITE_ALLOW_WRITE);
|
|
/*
|
|
Previously writers were not allowed to start, now it is ok to
|
|
start them again. Readers are already allowed so no reason to
|
|
handle them.
|
|
*/
|
|
start_writers= TRUE;
|
|
break;
|
|
default:
|
|
DBUG_ASSERT(0);
|
|
break;
|
|
}
|
|
if (start_writers)
|
|
{
|
|
/*
|
|
At this time the only active writer can be ourselves. Thus we need
|
|
not worry about that there are other concurrent write operations
|
|
active on the table. Thus we only need to worry about starting
|
|
waiting operations.
|
|
We also only come here with TL_WRITE_ALLOW_WRITE as the new
|
|
lock type, thus we can start other writers also of the same type.
|
|
If we find a lock at exclusive level >= TL_WRITE_LOW_PRIORITY we
|
|
don't start any more operations that would be mean those operations
|
|
will have to wait for things started afterwards.
|
|
*/
|
|
DBUG_ASSERT(new_lock_type == TL_WRITE_ALLOW_WRITE);
|
|
for (data=lock->write_wait.data; data ; data= next)
|
|
{
|
|
/*
|
|
All WRITE requests compatible with new lock type are also
|
|
started
|
|
*/
|
|
next= data->next;
|
|
if (start_writers && data->type == new_lock_type)
|
|
{
|
|
pthread_cond_t *cond= data->cond;
|
|
/*
|
|
It is ok to start this waiter.
|
|
Move from being first in wait queue to be last in write queue.
|
|
*/
|
|
if (((*data->prev)= data->next))
|
|
data->next->prev= data->prev;
|
|
else
|
|
lock->write_wait.last= data->prev;
|
|
data->prev= lock->write.last;
|
|
lock->write.last= &data->next;
|
|
data->next= 0;
|
|
check_locks(lock, "Started write lock after downgrade",0);
|
|
data->cond= 0;
|
|
pthread_cond_signal(cond);
|
|
}
|
|
else
|
|
{
|
|
/*
|
|
We found an incompatible lock, we won't start any more write
|
|
requests to avoid letting writers pass other writers in the
|
|
queue.
|
|
*/
|
|
start_writers= FALSE;
|
|
if (data->type >= TL_WRITE_LOW_PRIORITY)
|
|
{
|
|
/*
|
|
We have an exclusive writer in the queue so we won't start
|
|
readers either.
|
|
*/
|
|
start_readers= FALSE;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if (start_readers)
|
|
{
|
|
DBUG_ASSERT(new_lock_type == TL_WRITE_ALLOW_WRITE ||
|
|
new_lock_type == TL_WRITE_ALLOW_READ);
|
|
/*
|
|
When we come here we know that the write locks are
|
|
TL_WRITE_ALLOW_WRITE or TL_WRITE_ALLOW_READ. This means that reads
|
|
are ok
|
|
*/
|
|
for (data=lock->read_wait.data; data ; data=next)
|
|
{
|
|
next= data->next;
|
|
/*
|
|
All reads are ok to start now except TL_READ_NO_INSERT when
|
|
write lock is TL_WRITE_ALLOW_READ.
|
|
*/
|
|
if (new_lock_type != TL_WRITE_ALLOW_READ ||
|
|
data->type != TL_READ_NO_INSERT)
|
|
{
|
|
pthread_cond_t *cond= data->cond;
|
|
if (((*data->prev)= data->next))
|
|
data->next->prev= data->prev;
|
|
else
|
|
lock->read_wait.last= data->prev;
|
|
data->prev= lock->read.last;
|
|
lock->read.last= &data->next;
|
|
data->next= 0;
|
|
|
|
if (data->type == TL_READ_NO_INSERT)
|
|
lock->read_no_write_count++;
|
|
check_locks(lock, "Started read lock after downgrade",0);
|
|
data->cond= 0;
|
|
pthread_cond_signal(cond);
|
|
}
|
|
}
|
|
}
|
|
check_locks(lock,"after starting waiters after downgrading lock",0);
|
|
#endif
|
|
pthread_mutex_unlock(&lock->mutex);
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
|
|
/* Upgrade a WRITE_DELAY lock to a WRITE_LOCK */
|
|
|
|
my_bool thr_upgrade_write_delay_lock(THR_LOCK_DATA *data)
|
|
{
|
|
THR_LOCK *lock=data->lock;
|
|
DBUG_ENTER("thr_upgrade_write_delay_lock");
|
|
|
|
pthread_mutex_lock(&lock->mutex);
|
|
if (data->type == TL_UNLOCK || data->type >= TL_WRITE_LOW_PRIORITY)
|
|
{
|
|
pthread_mutex_unlock(&lock->mutex);
|
|
DBUG_RETURN(data->type == TL_UNLOCK); /* Test if Aborted */
|
|
}
|
|
check_locks(lock,"before upgrading lock",0);
|
|
/* TODO: Upgrade to TL_WRITE_CONCURRENT_INSERT in some cases */
|
|
data->type=TL_WRITE; /* Upgrade lock */
|
|
|
|
/* Check if someone has given us the lock */
|
|
if (!data->cond)
|
|
{
|
|
if (!lock->read.data) /* No read locks */
|
|
{ /* We have the lock */
|
|
if (data->lock->get_status)
|
|
(*data->lock->get_status)(data->status_param, 0);
|
|
pthread_mutex_unlock(&lock->mutex);
|
|
DBUG_RETURN(0);
|
|
}
|
|
|
|
if (((*data->prev)=data->next)) /* remove from lock-list */
|
|
data->next->prev= data->prev;
|
|
else
|
|
lock->write.last=data->prev;
|
|
|
|
if ((data->next=lock->write_wait.data)) /* Put first in lock_list */
|
|
data->next->prev= &data->next;
|
|
else
|
|
lock->write_wait.last= &data->next;
|
|
data->prev= &lock->write_wait.data;
|
|
lock->write_wait.data=data;
|
|
check_locks(lock,"upgrading lock",0);
|
|
}
|
|
else
|
|
{
|
|
check_locks(lock,"waiting for lock",0);
|
|
}
|
|
DBUG_RETURN(wait_for_lock(&lock->write_wait,data,1));
|
|
}
|
|
|
|
|
|
/* downgrade a WRITE lock to a WRITE_DELAY lock if there is pending locks */
|
|
|
|
my_bool thr_reschedule_write_lock(THR_LOCK_DATA *data)
|
|
{
|
|
THR_LOCK *lock=data->lock;
|
|
DBUG_ENTER("thr_reschedule_write_lock");
|
|
|
|
pthread_mutex_lock(&lock->mutex);
|
|
if (!lock->read_wait.data) /* No waiting read locks */
|
|
{
|
|
pthread_mutex_unlock(&lock->mutex);
|
|
DBUG_RETURN(0);
|
|
}
|
|
|
|
data->type=TL_WRITE_DELAYED;
|
|
if (lock->update_status)
|
|
(*lock->update_status)(data->status_param);
|
|
if (((*data->prev)=data->next)) /* remove from lock-list */
|
|
data->next->prev= data->prev;
|
|
else
|
|
lock->write.last=data->prev;
|
|
|
|
if ((data->next=lock->write_wait.data)) /* Put first in lock_list */
|
|
data->next->prev= &data->next;
|
|
else
|
|
lock->write_wait.last= &data->next;
|
|
data->prev= &lock->write_wait.data;
|
|
data->cond=get_cond(); /* This was zero */
|
|
lock->write_wait.data=data;
|
|
free_all_read_locks(lock,0);
|
|
|
|
pthread_mutex_unlock(&lock->mutex);
|
|
DBUG_RETURN(thr_upgrade_write_delay_lock(data));
|
|
}
|
|
|
|
|
|
#include <my_sys.h>
|
|
|
|
static void thr_print_lock(const char* name,struct st_lock_list *list)
|
|
{
|
|
THR_LOCK_DATA *data,**prev;
|
|
uint count=0;
|
|
|
|
if (list->data)
|
|
{
|
|
printf("%-10s: ",name);
|
|
prev= &list->data;
|
|
for (data=list->data; data && count++ < MAX_LOCKS ; data=data->next)
|
|
{
|
|
printf("0x%lx (%lu:%d); ", (ulong) data, data->owner->info->thread_id,
|
|
(int) data->type);
|
|
if (data->prev != prev)
|
|
printf("\nWarning: prev didn't point at previous lock\n");
|
|
prev= &data->next;
|
|
}
|
|
puts("");
|
|
if (prev != list->last)
|
|
printf("Warning: last didn't point at last lock\n");
|
|
}
|
|
}
|
|
|
|
void thr_print_locks(void)
|
|
{
|
|
LIST *list;
|
|
uint count=0;
|
|
|
|
pthread_mutex_lock(&THR_LOCK_lock);
|
|
puts("Current locks:");
|
|
for (list= thr_lock_thread_list; list && count++ < MAX_THREADS;
|
|
list= list_rest(list))
|
|
{
|
|
THR_LOCK *lock=(THR_LOCK*) list->data;
|
|
VOID(pthread_mutex_lock(&lock->mutex));
|
|
printf("lock: 0x%lx:",(ulong) lock);
|
|
if ((lock->write_wait.data || lock->read_wait.data) &&
|
|
(! lock->read.data && ! lock->write.data))
|
|
printf(" WARNING: ");
|
|
if (lock->write.data)
|
|
printf(" write");
|
|
if (lock->write_wait.data)
|
|
printf(" write_wait");
|
|
if (lock->read.data)
|
|
printf(" read");
|
|
if (lock->read_wait.data)
|
|
printf(" read_wait");
|
|
puts("");
|
|
thr_print_lock("write",&lock->write);
|
|
thr_print_lock("write_wait",&lock->write_wait);
|
|
thr_print_lock("read",&lock->read);
|
|
thr_print_lock("read_wait",&lock->read_wait);
|
|
VOID(pthread_mutex_unlock(&lock->mutex));
|
|
puts("");
|
|
}
|
|
fflush(stdout);
|
|
pthread_mutex_unlock(&THR_LOCK_lock);
|
|
}
|
|
|
|
#endif /* THREAD */
|
|
|
|
/*****************************************************************************
|
|
** Test of thread locks
|
|
****************************************************************************/
|
|
|
|
#ifdef MAIN
|
|
|
|
#ifdef THREAD
|
|
|
|
struct st_test {
|
|
uint lock_nr;
|
|
enum thr_lock_type lock_type;
|
|
};
|
|
|
|
THR_LOCK locks[5]; /* 4 locks */
|
|
|
|
struct st_test test_0[] = {{0,TL_READ}}; /* One lock */
|
|
struct st_test test_1[] = {{0,TL_READ},{0,TL_WRITE}}; /* Read and write lock of lock 0 */
|
|
struct st_test test_2[] = {{1,TL_WRITE},{0,TL_READ},{2,TL_READ}};
|
|
struct st_test test_3[] = {{2,TL_WRITE},{1,TL_READ},{0,TL_READ}}; /* Deadlock with test_2 ? */
|
|
struct st_test test_4[] = {{0,TL_WRITE},{0,TL_READ},{0,TL_WRITE},{0,TL_READ}};
|
|
struct st_test test_5[] = {{0,TL_READ},{1,TL_READ},{2,TL_READ},{3,TL_READ}}; /* Many reads */
|
|
struct st_test test_6[] = {{0,TL_WRITE},{1,TL_WRITE},{2,TL_WRITE},{3,TL_WRITE}}; /* Many writes */
|
|
struct st_test test_7[] = {{3,TL_READ}};
|
|
struct st_test test_8[] = {{1,TL_READ_NO_INSERT},{2,TL_READ_NO_INSERT},{3,TL_READ_NO_INSERT}}; /* Should be quick */
|
|
struct st_test test_9[] = {{4,TL_READ_HIGH_PRIORITY}};
|
|
struct st_test test_10[] ={{4,TL_WRITE}};
|
|
struct st_test test_11[] = {{0,TL_WRITE_LOW_PRIORITY},{1,TL_WRITE_LOW_PRIORITY},{2,TL_WRITE_LOW_PRIORITY},{3,TL_WRITE_LOW_PRIORITY}}; /* Many writes */
|
|
struct st_test test_12[] = {{0,TL_WRITE_ALLOW_READ},{1,TL_WRITE_ALLOW_READ},{2,TL_WRITE_ALLOW_READ},{3,TL_WRITE_ALLOW_READ}}; /* Many writes */
|
|
struct st_test test_13[] = {{0,TL_WRITE_CONCURRENT_INSERT},{1,TL_WRITE_CONCURRENT_INSERT},{2,TL_WRITE_CONCURRENT_INSERT},{3,TL_WRITE_CONCURRENT_INSERT}};
|
|
struct st_test test_14[] = {{0,TL_WRITE_CONCURRENT_INSERT},{1,TL_READ}};
|
|
struct st_test test_15[] = {{0,TL_WRITE_ALLOW_WRITE},{1,TL_READ}};
|
|
struct st_test test_16[] = {{0,TL_WRITE_ALLOW_WRITE},{1,TL_WRITE_ALLOW_WRITE}};
|
|
|
|
struct st_test *tests[] = {test_0,test_1,test_2,test_3,test_4,test_5,test_6,
|
|
test_7,test_8,test_9,test_10,test_11,test_12,
|
|
test_13,test_14,test_15,test_16};
|
|
int lock_counts[]= {sizeof(test_0)/sizeof(struct st_test),
|
|
sizeof(test_1)/sizeof(struct st_test),
|
|
sizeof(test_2)/sizeof(struct st_test),
|
|
sizeof(test_3)/sizeof(struct st_test),
|
|
sizeof(test_4)/sizeof(struct st_test),
|
|
sizeof(test_5)/sizeof(struct st_test),
|
|
sizeof(test_6)/sizeof(struct st_test),
|
|
sizeof(test_7)/sizeof(struct st_test),
|
|
sizeof(test_8)/sizeof(struct st_test),
|
|
sizeof(test_9)/sizeof(struct st_test),
|
|
sizeof(test_10)/sizeof(struct st_test),
|
|
sizeof(test_11)/sizeof(struct st_test),
|
|
sizeof(test_12)/sizeof(struct st_test),
|
|
sizeof(test_13)/sizeof(struct st_test),
|
|
sizeof(test_14)/sizeof(struct st_test),
|
|
sizeof(test_15)/sizeof(struct st_test),
|
|
sizeof(test_16)/sizeof(struct st_test)
|
|
};
|
|
|
|
|
|
static pthread_cond_t COND_thread_count;
|
|
static pthread_mutex_t LOCK_thread_count;
|
|
static uint thread_count;
|
|
static ulong sum=0;
|
|
|
|
#define MAX_LOCK_COUNT 8
|
|
|
|
/* The following functions is for WRITE_CONCURRENT_INSERT */
|
|
|
|
static void test_get_status(void* param __attribute__((unused)),
|
|
int concurrent_insert __attribute__((unused)))
|
|
{
|
|
}
|
|
|
|
static void test_copy_status(void* to __attribute__((unused)) ,
|
|
void *from __attribute__((unused)))
|
|
{
|
|
}
|
|
|
|
static my_bool test_check_status(void* param __attribute__((unused)))
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
|
|
static void *test_thread(void *arg)
|
|
{
|
|
int i,j,param=*((int*) arg);
|
|
THR_LOCK_DATA data[MAX_LOCK_COUNT];
|
|
THR_LOCK_OWNER owner;
|
|
THR_LOCK_INFO lock_info;
|
|
THR_LOCK_DATA *multi_locks[MAX_LOCK_COUNT];
|
|
my_thread_init();
|
|
|
|
printf("Thread %s (%d) started\n",my_thread_name(),param); fflush(stdout);
|
|
|
|
|
|
thr_lock_info_init(&lock_info);
|
|
thr_lock_owner_init(&owner, &lock_info);
|
|
for (i=0; i < lock_counts[param] ; i++)
|
|
thr_lock_data_init(locks+tests[param][i].lock_nr,data+i,NULL);
|
|
for (j=1 ; j < 10 ; j++) /* try locking 10 times */
|
|
{
|
|
for (i=0; i < lock_counts[param] ; i++)
|
|
{ /* Init multi locks */
|
|
multi_locks[i]= &data[i];
|
|
data[i].type= tests[param][i].lock_type;
|
|
}
|
|
thr_multi_lock(multi_locks, lock_counts[param], &owner);
|
|
pthread_mutex_lock(&LOCK_thread_count);
|
|
{
|
|
int tmp=rand() & 7; /* Do something from 0-2 sec */
|
|
if (tmp == 0)
|
|
sleep(1);
|
|
else if (tmp == 1)
|
|
sleep(2);
|
|
else
|
|
{
|
|
ulong k;
|
|
for (k=0 ; k < (ulong) (tmp-2)*100000L ; k++)
|
|
sum+=k;
|
|
}
|
|
}
|
|
pthread_mutex_unlock(&LOCK_thread_count);
|
|
thr_multi_unlock(multi_locks,lock_counts[param]);
|
|
}
|
|
|
|
printf("Thread %s (%d) ended\n",my_thread_name(),param); fflush(stdout);
|
|
thr_print_locks();
|
|
pthread_mutex_lock(&LOCK_thread_count);
|
|
thread_count--;
|
|
VOID(pthread_cond_signal(&COND_thread_count)); /* Tell main we are ready */
|
|
pthread_mutex_unlock(&LOCK_thread_count);
|
|
free((gptr) arg);
|
|
return 0;
|
|
}
|
|
|
|
|
|
int main(int argc __attribute__((unused)),char **argv __attribute__((unused)))
|
|
{
|
|
pthread_t tid;
|
|
pthread_attr_t thr_attr;
|
|
int i,*param,error;
|
|
MY_INIT(argv[0]);
|
|
if (argc > 1 && argv[1][0] == '-' && argv[1][1] == '#')
|
|
DBUG_PUSH(argv[1]+2);
|
|
|
|
printf("Main thread: %s\n",my_thread_name());
|
|
|
|
if ((error=pthread_cond_init(&COND_thread_count,NULL)))
|
|
{
|
|
fprintf(stderr,"Got error: %d from pthread_cond_init (errno: %d)",
|
|
error,errno);
|
|
exit(1);
|
|
}
|
|
if ((error=pthread_mutex_init(&LOCK_thread_count,MY_MUTEX_INIT_FAST)))
|
|
{
|
|
fprintf(stderr,"Got error: %d from pthread_cond_init (errno: %d)",
|
|
error,errno);
|
|
exit(1);
|
|
}
|
|
|
|
for (i=0 ; i < (int) array_elements(locks) ; i++)
|
|
{
|
|
thr_lock_init(locks+i);
|
|
locks[i].check_status= test_check_status;
|
|
locks[i].update_status=test_get_status;
|
|
locks[i].copy_status= test_copy_status;
|
|
locks[i].get_status= test_get_status;
|
|
}
|
|
if ((error=pthread_attr_init(&thr_attr)))
|
|
{
|
|
fprintf(stderr,"Got error: %d from pthread_attr_init (errno: %d)",
|
|
error,errno);
|
|
exit(1);
|
|
}
|
|
if ((error=pthread_attr_setdetachstate(&thr_attr,PTHREAD_CREATE_DETACHED)))
|
|
{
|
|
fprintf(stderr,
|
|
"Got error: %d from pthread_attr_setdetachstate (errno: %d)",
|
|
error,errno);
|
|
exit(1);
|
|
}
|
|
#ifndef pthread_attr_setstacksize /* void return value */
|
|
if ((error=pthread_attr_setstacksize(&thr_attr,65536L)))
|
|
{
|
|
fprintf(stderr,"Got error: %d from pthread_attr_setstacksize (errno: %d)",
|
|
error,errno);
|
|
exit(1);
|
|
}
|
|
#endif
|
|
#ifdef HAVE_THR_SETCONCURRENCY
|
|
VOID(thr_setconcurrency(2));
|
|
#endif
|
|
for (i=0 ; i < (int) array_elements(lock_counts) ; i++)
|
|
{
|
|
param=(int*) malloc(sizeof(int));
|
|
*param=i;
|
|
|
|
if ((error=pthread_mutex_lock(&LOCK_thread_count)))
|
|
{
|
|
fprintf(stderr,"Got error: %d from pthread_mutex_lock (errno: %d)",
|
|
error,errno);
|
|
exit(1);
|
|
}
|
|
if ((error=pthread_create(&tid,&thr_attr,test_thread,(void*) param)))
|
|
{
|
|
fprintf(stderr,"Got error: %d from pthread_create (errno: %d)\n",
|
|
error,errno);
|
|
pthread_mutex_unlock(&LOCK_thread_count);
|
|
exit(1);
|
|
}
|
|
thread_count++;
|
|
pthread_mutex_unlock(&LOCK_thread_count);
|
|
}
|
|
|
|
pthread_attr_destroy(&thr_attr);
|
|
if ((error=pthread_mutex_lock(&LOCK_thread_count)))
|
|
fprintf(stderr,"Got error: %d from pthread_mutex_lock\n",error);
|
|
while (thread_count)
|
|
{
|
|
if ((error=pthread_cond_wait(&COND_thread_count,&LOCK_thread_count)))
|
|
fprintf(stderr,"Got error: %d from pthread_cond_wait\n",error);
|
|
}
|
|
if ((error=pthread_mutex_unlock(&LOCK_thread_count)))
|
|
fprintf(stderr,"Got error: %d from pthread_mutex_unlock\n",error);
|
|
for (i=0 ; i < (int) array_elements(locks) ; i++)
|
|
thr_lock_delete(locks+i);
|
|
#ifdef EXTRA_DEBUG
|
|
if (found_errors)
|
|
printf("Got %d warnings\n",found_errors);
|
|
else
|
|
#endif
|
|
printf("Test succeeded\n");
|
|
return 0;
|
|
}
|
|
|
|
#else /* THREAD */
|
|
|
|
int main(int argc __attribute__((unused)),char **argv __attribute__((unused)))
|
|
{
|
|
printf("thr_lock disabled because we are not using threads\n");
|
|
exit(1);
|
|
}
|
|
|
|
#endif /* THREAD */
|
|
#endif /* MAIN */
|