5.5 merge

1 files changed, 7 insertions, 274 deletions

diff --git a/.bzrignore b/.bzrignore
index 682d8e983d5..7542a1bff29 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -1169,292 +1169,25 @@ testtemp1
 testtemp2
 testtry
 storage/tokudb/ft-index/CTestCustom.cmake
-storage/tokudb/ft-index/DartConfiguration.tcl
-storage/tokudb/ft-index/ctags-stamp
-storage/tokudb/ft-index/valgrind.suppressions
 storage/tokudb/ft-index/xz
 storage/tokudb/ft-index/buildheader/db.h
 storage/tokudb/ft-index/buildheader/make_tdb
 storage/tokudb/ft-index/buildheader/runcat.sh
-storage/tokudb/ft-index/ft/ftverify
 storage/tokudb/ft-index/ft/log_code.cc
 storage/tokudb/ft-index/ft/log_header.h
 storage/tokudb/ft-index/ft/log_print.cc
 storage/tokudb/ft-index/ft/logformat
-storage/tokudb/ft-index/ft/tdb-recover
-storage/tokudb/ft-index/ft/tdb_logprint
-storage/tokudb/ft-index/ft/tokuftdump
-storage/tokudb/ft-index/ft/tests/benchmark-test
-storage/tokudb/ft-index/ft/tests/block_allocator_test
-storage/tokudb/ft-index/ft/tests/bnc-insert-benchmark
-storage/tokudb/ft-index/ft/tests/cachetable-4357
-storage/tokudb/ft-index/ft/tests/cachetable-4365
-storage/tokudb/ft-index/ft/tests/cachetable-5097
-storage/tokudb/ft-index/ft/tests/cachetable-5978
-storage/tokudb/ft-index/ft/tests/cachetable-5978-2
-storage/tokudb/ft-index/ft/tests/cachetable-all-write
-storage/tokudb/ft-index/ft/tests/cachetable-checkpoint-pending
-storage/tokudb/ft-index/ft/tests/cachetable-checkpoint-pinned-nodes
-storage/tokudb/ft-index/ft/tests/cachetable-checkpoint-prefetched-nodes
-storage/tokudb/ft-index/ft/tests/cachetable-checkpoint-test
-storage/tokudb/ft-index/ft/tests/cachetable-checkpointer-class
-storage/tokudb/ft-index/ft/tests/cachetable-cleaner-checkpoint
-storage/tokudb/ft-index/ft/tests/cachetable-cleaner-checkpoint2
-storage/tokudb/ft-index/ft/tests/cachetable-cleaner-thread-attrs-accumulate
-storage/tokudb/ft-index/ft/tests/cachetable-cleaner-thread-empty-cachetable
-storage/tokudb/ft-index/ft/tests/cachetable-cleaner-thread-everything-pinned
-storage/tokudb/ft-index/ft/tests/cachetable-cleaner-thread-nothing-needs-flushing
-storage/tokudb/ft-index/ft/tests/cachetable-cleaner-thread-same-fullhash
-storage/tokudb/ft-index/ft/tests/cachetable-cleaner-thread-simple
-storage/tokudb/ft-index/ft/tests/cachetable-clock-all-pinned
-storage/tokudb/ft-index/ft/tests/cachetable-clock-eviction
-storage/tokudb/ft-index/ft/tests/cachetable-clock-eviction2
-storage/tokudb/ft-index/ft/tests/cachetable-clock-eviction3
-storage/tokudb/ft-index/ft/tests/cachetable-clock-eviction4
-storage/tokudb/ft-index/ft/tests/cachetable-clone-checkpoint
-storage/tokudb/ft-index/ft/tests/cachetable-clone-partial-fetch
-storage/tokudb/ft-index/ft/tests/cachetable-clone-partial-fetch-pinned-node
-storage/tokudb/ft-index/ft/tests/cachetable-clone-pin-nonblocking
-storage/tokudb/ft-index/ft/tests/cachetable-clone-unpin-remove
-storage/tokudb/ft-index/ft/tests/cachetable-count-pinned-test
-storage/tokudb/ft-index/ft/tests/cachetable-debug-test
-storage/tokudb/ft-index/ft/tests/cachetable-eviction-close-test
-storage/tokudb/ft-index/ft/tests/cachetable-eviction-close-test2
-storage/tokudb/ft-index/ft/tests/cachetable-eviction-getandpin-test
-storage/tokudb/ft-index/ft/tests/cachetable-eviction-getandpin-test2
-storage/tokudb/ft-index/ft/tests/cachetable-evictor-class
-storage/tokudb/ft-index/ft/tests/cachetable-fd-test
-storage/tokudb/ft-index/ft/tests/cachetable-fetch-inducing-evictor
-storage/tokudb/ft-index/ft/tests/cachetable-flush-during-cleaner
-storage/tokudb/ft-index/ft/tests/cachetable-flush-test
-storage/tokudb/ft-index/ft/tests/cachetable-getandpin-test
-storage/tokudb/ft-index/ft/tests/cachetable-kibbutz_and_flush_cachefile
-storage/tokudb/ft-index/ft/tests/cachetable-partial-fetch
-storage/tokudb/ft-index/ft/tests/cachetable-pin-checkpoint
-storage/tokudb/ft-index/ft/tests/cachetable-pin-nonblocking-checkpoint-clean
-storage/tokudb/ft-index/ft/tests/cachetable-prefetch-checkpoint-test
-storage/tokudb/ft-index/ft/tests/cachetable-prefetch-close-leak-test
-storage/tokudb/ft-index/ft/tests/cachetable-prefetch-close-test
-storage/tokudb/ft-index/ft/tests/cachetable-prefetch-flowcontrol-test
-storage/tokudb/ft-index/ft/tests/cachetable-prefetch-getandpin-test
-storage/tokudb/ft-index/ft/tests/cachetable-prefetch-maybegetandpin-test
-storage/tokudb/ft-index/ft/tests/cachetable-prefetch2-test
-storage/tokudb/ft-index/ft/tests/cachetable-put-checkpoint
-storage/tokudb/ft-index/ft/tests/cachetable-put-test
-storage/tokudb/ft-index/ft/tests/cachetable-rwlock-test
-storage/tokudb/ft-index/ft/tests/cachetable-simple-clone
-storage/tokudb/ft-index/ft/tests/cachetable-simple-clone2
-storage/tokudb/ft-index/ft/tests/cachetable-simple-maybe-get-pin
-storage/tokudb/ft-index/ft/tests/cachetable-simple-pin
-storage/tokudb/ft-index/ft/tests/cachetable-simple-pin-cheap
-storage/tokudb/ft-index/ft/tests/cachetable-simple-pin-dep-nodes
-storage/tokudb/ft-index/ft/tests/cachetable-simple-pin-nonblocking
-storage/tokudb/ft-index/ft/tests/cachetable-simple-pin-nonblocking-cheap
-storage/tokudb/ft-index/ft/tests/cachetable-simple-put-dep-nodes
-storage/tokudb/ft-index/ft/tests/cachetable-simple-read-pin
-storage/tokudb/ft-index/ft/tests/cachetable-simple-read-pin-nonblocking
-storage/tokudb/ft-index/ft/tests/cachetable-simple-unpin-remove-checkpoint
-storage/tokudb/ft-index/ft/tests/cachetable-simple-verify
-storage/tokudb/ft-index/ft/tests/cachetable-test
-storage/tokudb/ft-index/ft/tests/cachetable-unpin-and-remove-test
-storage/tokudb/ft-index/ft/tests/cachetable-unpin-remove-and-checkpoint
-storage/tokudb/ft-index/ft/tests/cachetable-unpin-test
-storage/tokudb/ft-index/ft/tests/cachetable-writer-thread-limit
-storage/tokudb/ft-index/ft/tests/comparator-test
-storage/tokudb/ft-index/ft/tests/compress-test
-storage/tokudb/ft-index/ft/tests/dbufio-test
-storage/tokudb/ft-index/ft/tests/dbufio-test-destroy
-storage/tokudb/ft-index/ft/tests/fifo-test
-storage/tokudb/ft-index/ft/tests/ft-bfe-query
-storage/tokudb/ft-index/ft/tests/ft-clock-test
-storage/tokudb/ft-index/ft/tests/ft-serialize-benchmark
-storage/tokudb/ft-index/ft/tests/ft-serialize-sub-block-test
-storage/tokudb/ft-index/ft/tests/ft-serialize-test
-storage/tokudb/ft-index/ft/tests/ft-test
-storage/tokudb/ft-index/ft/tests/ft-test-cursor
-storage/tokudb/ft-index/ft/tests/ft-test-cursor-2
-storage/tokudb/ft-index/ft/tests/ft-test-header
-storage/tokudb/ft-index/ft/tests/ft-test0
-storage/tokudb/ft-index/ft/tests/ft-test1
-storage/tokudb/ft-index/ft/tests/ft-test2
-storage/tokudb/ft-index/ft/tests/ft-test3
-storage/tokudb/ft-index/ft/tests/ft-test4
-storage/tokudb/ft-index/ft/tests/ft-test5
-storage/tokudb/ft-index/ft/tests/ftloader-test
-storage/tokudb/ft-index/ft/tests/ftloader-test-bad-generate
-storage/tokudb/ft-index/ft/tests/ftloader-test-extractor
-storage/tokudb/ft-index/ft/tests/ftloader-test-extractor-errors
-storage/tokudb/ft-index/ft/tests/ftloader-test-merge-files-dbufio
-storage/tokudb/ft-index/ft/tests/ftloader-test-open
-storage/tokudb/ft-index/ft/tests/ftloader-test-vm
-storage/tokudb/ft-index/ft/tests/ftloader-test-writer
-storage/tokudb/ft-index/ft/tests/ftloader-test-writer-errors
-storage/tokudb/ft-index/ft/tests/is_empty
-storage/tokudb/ft-index/ft/tests/keyrange
-storage/tokudb/ft-index/ft/tests/keytest
-storage/tokudb/ft-index/ft/tests/le-cursor-provdel
-storage/tokudb/ft-index/ft/tests/le-cursor-right
-storage/tokudb/ft-index/ft/tests/le-cursor-walk
-storage/tokudb/ft-index/ft/tests/list-test
-storage/tokudb/ft-index/ft/tests/log-test
-storage/tokudb/ft-index/ft/tests/log-test-maybe-trim
-storage/tokudb/ft-index/ft/tests/log-test2
-storage/tokudb/ft-index/ft/tests/log-test3
-storage/tokudb/ft-index/ft/tests/log-test4
-storage/tokudb/ft-index/ft/tests/log-test5
-storage/tokudb/ft-index/ft/tests/log-test6
-storage/tokudb/ft-index/ft/tests/log-test7
-storage/tokudb/ft-index/ft/tests/logcursor-bad-checksum
-storage/tokudb/ft-index/ft/tests/logcursor-empty-logdir
-storage/tokudb/ft-index/ft/tests/logcursor-empty-logfile
-storage/tokudb/ft-index/ft/tests/logcursor-empty-logfile-2
-storage/tokudb/ft-index/ft/tests/logcursor-empty-logfile-3
-storage/tokudb/ft-index/ft/tests/logcursor-print
-storage/tokudb/ft-index/ft/tests/logcursor-timestamp
-storage/tokudb/ft-index/ft/tests/logfilemgr-create-destroy
-storage/tokudb/ft-index/ft/tests/logfilemgr-print
-storage/tokudb/ft-index/ft/tests/make-tree
-storage/tokudb/ft-index/ft/tests/minicron-test
-storage/tokudb/ft-index/ft/tests/msnfilter
-storage/tokudb/ft-index/ft/tests/omt-test
-storage/tokudb/ft-index/ft/tests/orthopush-flush
-storage/tokudb/ft-index/ft/tests/pqueue-test
-storage/tokudb/ft-index/ft/tests/queue-test
-storage/tokudb/ft-index/ft/tests/quicklz-test
-storage/tokudb/ft-index/ft/tests/recovery-bad-last-entry
-storage/tokudb/ft-index/ft/tests/recovery-cbegin
-storage/tokudb/ft-index/ft/tests/recovery-cbegin-cend
-storage/tokudb/ft-index/ft/tests/recovery-cbegin-cend-hello
-storage/tokudb/ft-index/ft/tests/recovery-cend-cbegin
-storage/tokudb/ft-index/ft/tests/recovery-datadir-is-file
-storage/tokudb/ft-index/ft/tests/recovery-empty
-storage/tokudb/ft-index/ft/tests/recovery-fopen-missing-file
-storage/tokudb/ft-index/ft/tests/recovery-hello
-storage/tokudb/ft-index/ft/tests/recovery-lsn-error-during-forward-scan
-storage/tokudb/ft-index/ft/tests/recovery-no-datadir
-storage/tokudb/ft-index/ft/tests/recovery-no-log
-storage/tokudb/ft-index/ft/tests/recovery-no-logdir
-storage/tokudb/ft-index/ft/tests/recovery-test5123
-storage/tokudb/ft-index/ft/tests/shortcut
-storage/tokudb/ft-index/ft/tests/subblock-test-checksum
-storage/tokudb/ft-index/ft/tests/subblock-test-compression
-storage/tokudb/ft-index/ft/tests/subblock-test-index
-storage/tokudb/ft-index/ft/tests/subblock-test-size
-storage/tokudb/ft-index/ft/tests/test-assert
-storage/tokudb/ft-index/ft/tests/test-bjm
-storage/tokudb/ft-index/ft/tests/test-checkpoint-during-flush
-storage/tokudb/ft-index/ft/tests/test-checkpoint-during-merge
-storage/tokudb/ft-index/ft/tests/test-checkpoint-during-rebalance
-storage/tokudb/ft-index/ft/tests/test-checkpoint-during-split
-storage/tokudb/ft-index/ft/tests/test-del-inorder
-storage/tokudb/ft-index/ft/tests/test-dirty-flushes-on-cleaner
-storage/tokudb/ft-index/ft/tests/test-dump-ft
-storage/tokudb/ft-index/ft/tests/test-flushes-on-cleaner
-storage/tokudb/ft-index/ft/tests/test-ft-overflow
-storage/tokudb/ft-index/ft/tests/test-hot-with-bounds
-storage/tokudb/ft-index/ft/tests/test-inc-split
-storage/tokudb/ft-index/ft/tests/test-leafentry-child-txn
-storage/tokudb/ft-index/ft/tests/test-leafentry-nested
-storage/tokudb/ft-index/ft/tests/test-merges-on-cleaner
-storage/tokudb/ft-index/ft/tests/test-oldest-referenced-xid-flush
-storage/tokudb/ft-index/ft/tests/test-pick-child-to-flush
-storage/tokudb/ft-index/ft/tests/test-txn-child-manager
-storage/tokudb/ft-index/ft/tests/test1308a
-storage/tokudb/ft-index/ft/tests/test3681
-storage/tokudb/ft-index/ft/tests/test3856
-storage/tokudb/ft-index/ft/tests/test3884
-storage/tokudb/ft-index/ft/tests/test4115
-storage/tokudb/ft-index/ft/tests/test4244
-storage/tokudb/ft-index/ft/tests/test_block_allocator_merge
-storage/tokudb/ft-index/ft/tests/test_logcursor
-storage/tokudb/ft-index/ft/tests/test_oexcl
-storage/tokudb/ft-index/ft/tests/test_toku_malloc_plain_free
-storage/tokudb/ft-index/ft/tests/upgrade_test_simple
-storage/tokudb/ft-index/ft/tests/verify-bad-msn
-storage/tokudb/ft-index/ft/tests/verify-bad-pivots
-storage/tokudb/ft-index/ft/tests/verify-dup-in-leaf
-storage/tokudb/ft-index/ft/tests/verify-dup-pivots
-storage/tokudb/ft-index/ft/tests/verify-misrouted-msgs
-storage/tokudb/ft-index/ft/tests/verify-unsorted-leaf
-storage/tokudb/ft-index/ft/tests/verify-unsorted-pivots
-storage/tokudb/ft-index/ft/tests/x1764-test
-storage/tokudb/ft-index/ft/tests/xid_lsn_independent
-storage/tokudb/ft-index/ft/tests/ybt-test
-storage/tokudb/ft-index/locktree/tests/concurrent_tree_create_destroy
-storage/tokudb/ft-index/locktree/tests/concurrent_tree_lkr_acquire_release
-storage/tokudb/ft-index/locktree/tests/concurrent_tree_lkr_insert_remove
-storage/tokudb/ft-index/locktree/tests/concurrent_tree_lkr_insert_serial_large
-storage/tokudb/ft-index/locktree/tests/concurrent_tree_lkr_remove_all
-storage/tokudb/ft-index/locktree/tests/lock_request_create_set
-storage/tokudb/ft-index/locktree/tests/lock_request_get_set_keys
-storage/tokudb/ft-index/locktree/tests/lock_request_start_deadlock
-storage/tokudb/ft-index/locktree/tests/lock_request_start_pending
-storage/tokudb/ft-index/locktree/tests/locktree_conflicts
-storage/tokudb/ft-index/locktree/tests/locktree_create_destroy
-storage/tokudb/ft-index/locktree/tests/locktree_infinity
-storage/tokudb/ft-index/locktree/tests/locktree_misc
-storage/tokudb/ft-index/locktree/tests/locktree_overlapping_relock
-storage/tokudb/ft-index/locktree/tests/locktree_simple_lock
-storage/tokudb/ft-index/locktree/tests/locktree_single_txnid_optimization
-storage/tokudb/ft-index/locktree/tests/manager_create_destroy
-storage/tokudb/ft-index/locktree/tests/manager_locktree_map
-storage/tokudb/ft-index/locktree/tests/manager_params
-storage/tokudb/ft-index/locktree/tests/manager_reference_release_lt
-storage/tokudb/ft-index/locktree/tests/manager_status
-storage/tokudb/ft-index/locktree/tests/range_buffer_test
-storage/tokudb/ft-index/locktree/tests/txnid_set_test
-storage/tokudb/ft-index/locktree/tests/wfg_test
 storage/tokudb/ft-index/portability/merge_archives_tokuportability_static.cmake
+storage/tokudb/ft-index/portability/toku_config.h
 storage/tokudb/ft-index/portability/tokuportability_static_depends.cc
-storage/tokudb/ft-index/portability/tests/test-active-cpus
-storage/tokudb/ft-index/portability/tests/test-cache-line-boundary-fails
-storage/tokudb/ft-index/portability/tests/test-cpu-freq
-storage/tokudb/ft-index/portability/tests/test-cpu-freq-openlimit17
-storage/tokudb/ft-index/portability/tests/test-fair-rwlock
-storage/tokudb/ft-index/portability/tests/test-filesystem-sizes
-storage/tokudb/ft-index/portability/tests/test-flock
-storage/tokudb/ft-index/portability/tests/test-fsync
-storage/tokudb/ft-index/portability/tests/test-fsync-directory
-storage/tokudb/ft-index/portability/tests/test-gettime
-storage/tokudb/ft-index/portability/tests/test-gettimeofday
-storage/tokudb/ft-index/portability/tests/test-hugepage
-storage/tokudb/ft-index/portability/tests/test-max-data
-storage/tokudb/ft-index/portability/tests/test-memory-status
-storage/tokudb/ft-index/portability/tests/test-pagesize
-storage/tokudb/ft-index/portability/tests/test-pthread-rwlock-rdlock
-storage/tokudb/ft-index/portability/tests/test-pthread-rwlock-rwr
-storage/tokudb/ft-index/portability/tests/test-pwrite4g
-storage/tokudb/ft-index/portability/tests/test-snprintf
-storage/tokudb/ft-index/portability/tests/test-stat
-storage/tokudb/ft-index/portability/tests/test-toku-malloc
-storage/tokudb/ft-index/portability/tests/test-xid
-storage/tokudb/ft-index/portability/tests/try-assert-zero
-storage/tokudb/ft-index/portability/tests/try-assert0
-storage/tokudb/ft-index/portability/tests/try-leak-lost
-storage/tokudb/ft-index/portability/tests/try-leak-reachable
-storage/tokudb/ft-index/portability/tests/try-uninit
 storage/tokudb/ft-index/src/merge_archives_tokufractaltree_static.cmake
 storage/tokudb/ft-index/src/tokufractaltree_static_depends.cc
-storage/tokudb/ft-index/src/tests/recovery_fileops_unit_dir
-storage/tokudb/ft-index/toku_include/toku_config.h
-storage/tokudb/ft-index/util/tests/marked-omt-test
-storage/tokudb/ft-index/util/tests/omt-tmpl-test
-storage/tokudb/ft-index/util/tests/sort-tmpl-test
-storage/tokudb/ft-index/util/tests/test-kibbutz
-storage/tokudb/ft-index/util/tests/test-kibbutz2
-storage/tokudb/ft-index/util/tests/test-rwlock
-storage/tokudb/ft-index/util/tests/test-rwlock-cheapness
-storage/tokudb/ft-index/util/tests/test_circular_buffer
-storage/tokudb/ft-index/util/tests/test_doubly_linked_list
-storage/tokudb/ft-index/util/tests/test_partitioned_counter
-storage/tokudb/ft-index/util/tests/test_partitioned_counter_5833
-storage/tokudb/ft-index/util/tests/threadpool-test
-storage/tokudb/ft-index/util/tests/threadpool-testrunf
-storage/tokudb/ft-index/utils/tokudb_dump
-storage/tokudb/ft-index/utils/tokudb_gen
-storage/tokudb/ft-index/utils/tokudb_load
-storage/connect/connect.cnf
-storage/cassandra/cassandra.cnf
+storage/tokudb/ft-index/tools/ba_replay
+storage/tokudb/ft-index/tools/ftverify
+storage/tokudb/ft-index/tools/tdb-recover
+storage/tokudb/ft-index/tools/tdb_logprint
+storage/tokudb/ft-index/tools/tokudb_dump
+storage/tokudb/ft-index/tools/tokuftdump
 libmysql/libmysql_versions.ld
 scripts/mysql_config.pl
 pcre/pcre_chartables.c