[Pkg-mysql-commits] [mariadb-5.5] 03/08: Imported Upstream version 5.5.41
Otto Kekäläinen
ottok-guest at moszumanska.debian.org
Sun Dec 28 21:49:40 UTC 2014
This is an automated email from the git hooks/post-receive script.
ottok-guest pushed a commit to branch master
in repository mariadb-5.5.
commit 6133249a8345ad2a363b094ec39d959ab2def038
Merge: 36bc99b 51b8410
Author: Otto Kekäläinen <otto at seravo.fi>
Date: Sat Dec 27 15:46:02 2014 +0200
Imported Upstream version 5.5.41
CMakeLists.txt | 41 +-
Docs/INFO_SRC | 10 +-
VERSION | 2 +-
client/mysql.cc | 12 +-
client/mysqlbinlog.cc | 5 +-
client/mysqltest.cc | 8 +-
cmake/build_configurations/mysql_release.cmake | 26 +-
cmake/compile_flags.cmake | 44 +
cmake/cpack_rpm.cmake | 2 +-
cmake/install_layout.cmake | 16 +-
cmake/jemalloc.cmake | 77 +-
cmake/maintainer.cmake | 93 +-
cmake/os/Darwin.cmake | 21 +-
cmake/os/WindowsCache.cmake | 6 +-
cmake/plugin.cmake | 2 +-
cmake/readline.cmake | 68 +-
cmd-line-utils/readline/CMakeLists.txt | 3 +-
cmd-line-utils/readline/history.h | 4 +-
cmd-line-utils/readline/keymaps.h | 6 +-
cmd-line-utils/readline/readline.h | 8 +-
cmd-line-utils/readline/xmalloc.h | 2 +-
config.h.cmake | 17 +
configure.cmake | 9 -
debian/dist/Debian/control | 7 +-
debian/dist/Ubuntu/control | 7 +-
extra/jemalloc/COPYING | 27 -
extra/jemalloc/ChangeLog | 425 -
extra/jemalloc/INSTALL | 293 -
extra/jemalloc/Makefile.in | 324 -
extra/jemalloc/README | 16 -
extra/jemalloc/VERSION | 1 -
extra/jemalloc/autogen.sh | 17 -
extra/jemalloc/bin/jemalloc.sh | 9 -
extra/jemalloc/bin/jemalloc.sh.in | 9 -
extra/jemalloc/bin/pprof | 5348 -
extra/jemalloc/config.guess | 1530 -
extra/jemalloc/config.stamp.in | 0
extra/jemalloc/config.sub | 1773 -
extra/jemalloc/configure | 8339 --
extra/jemalloc/configure.ac | 1333 -
extra/jemalloc/doc/html.xsl.in | 4 -
extra/jemalloc/doc/jemalloc.3 | 1482 -
extra/jemalloc/doc/jemalloc.html | 1417 -
extra/jemalloc/doc/jemalloc.xml.in | 2176 -
extra/jemalloc/doc/manpages.xsl.in | 4 -
extra/jemalloc/doc/stylesheet.xsl | 7 -
extra/jemalloc/include/jemalloc/internal/arena.h | 1022 -
extra/jemalloc/include/jemalloc/internal/atomic.h | 304 -
extra/jemalloc/include/jemalloc/internal/base.h | 26 -
extra/jemalloc/include/jemalloc/internal/bitmap.h | 184 -
extra/jemalloc/include/jemalloc/internal/chunk.h | 63 -
.../jemalloc/include/jemalloc/internal/chunk_dss.h | 38 -
.../include/jemalloc/internal/chunk_mmap.h | 22 -
extra/jemalloc/include/jemalloc/internal/ckh.h | 88 -
extra/jemalloc/include/jemalloc/internal/ctl.h | 117 -
extra/jemalloc/include/jemalloc/internal/extent.h | 46 -
extra/jemalloc/include/jemalloc/internal/hash.h | 331 -
extra/jemalloc/include/jemalloc/internal/huge.h | 40 -
.../jemalloc/internal/jemalloc_internal.h.in | 1026 -
extra/jemalloc/include/jemalloc/internal/mb.h | 115 -
extra/jemalloc/include/jemalloc/internal/mutex.h | 99 -
.../include/jemalloc/internal/private_namespace.h | 390 -
extra/jemalloc/include/jemalloc/internal/prng.h | 60 -
extra/jemalloc/include/jemalloc/internal/prof.h | 579 -
extra/jemalloc/include/jemalloc/internal/ql.h | 83 -
extra/jemalloc/include/jemalloc/internal/qr.h | 67 -
.../include/jemalloc/internal/quarantine.h | 67 -
extra/jemalloc/include/jemalloc/internal/rb.h | 973 -
extra/jemalloc/include/jemalloc/internal/rtree.h | 164 -
.../include/jemalloc/internal/size_classes.sh | 122 -
extra/jemalloc/include/jemalloc/internal/stats.h | 173 -
extra/jemalloc/include/jemalloc/internal/tcache.h | 442 -
extra/jemalloc/include/jemalloc/internal/tsd.h | 397 -
extra/jemalloc/include/jemalloc/internal/util.h | 160 -
extra/jemalloc/include/jemalloc/jemalloc.h.in | 157 -
extra/jemalloc/include/jemalloc/jemalloc_defs.h.in | 267 -
extra/jemalloc/include/msvc_compat/inttypes.h | 313 -
extra/jemalloc/include/msvc_compat/stdbool.h | 16 -
extra/jemalloc/include/msvc_compat/stdint.h | 247 -
extra/jemalloc/include/msvc_compat/strings.h | 23 -
extra/jemalloc/install-sh | 250 -
extra/jemalloc/src/arena.c | 2365 -
extra/jemalloc/src/atomic.c | 2 -
extra/jemalloc/src/base.c | 142 -
extra/jemalloc/src/bitmap.c | 90 -
extra/jemalloc/src/chunk.c | 385 -
extra/jemalloc/src/chunk_dss.c | 197 -
extra/jemalloc/src/chunk_mmap.c | 210 -
extra/jemalloc/src/ckh.c | 563 -
extra/jemalloc/src/ctl.c | 1673 -
extra/jemalloc/src/extent.c | 39 -
extra/jemalloc/src/hash.c | 2 -
extra/jemalloc/src/huge.c | 313 -
extra/jemalloc/src/jemalloc.c | 1868 -
extra/jemalloc/src/mb.c | 2 -
extra/jemalloc/src/mutex.c | 149 -
extra/jemalloc/src/prof.c | 1283 -
extra/jemalloc/src/quarantine.c | 190 -
extra/jemalloc/src/rtree.c | 67 -
extra/jemalloc/src/stats.c | 549 -
extra/jemalloc/src/tcache.c | 476 -
extra/jemalloc/src/tsd.c | 107 -
extra/jemalloc/src/util.c | 641 -
extra/jemalloc/src/zone.c | 258 -
extra/jemalloc/test/ALLOCM_ARENA.c | 67 -
extra/jemalloc/test/ALLOCM_ARENA.exp | 2 -
extra/jemalloc/test/aligned_alloc.c | 119 -
extra/jemalloc/test/aligned_alloc.exp | 25 -
extra/jemalloc/test/allocated.c | 118 -
extra/jemalloc/test/allocated.exp | 2 -
extra/jemalloc/test/allocm.c | 194 -
extra/jemalloc/test/allocm.exp | 25 -
extra/jemalloc/test/bitmap.c | 153 -
extra/jemalloc/test/bitmap.exp | 2 -
extra/jemalloc/test/jemalloc_test.h.in | 53 -
extra/jemalloc/test/mremap.c | 60 -
extra/jemalloc/test/mremap.exp | 2 -
extra/jemalloc/test/posix_memalign.c | 115 -
extra/jemalloc/test/posix_memalign.exp | 25 -
extra/jemalloc/test/rallocm.c | 127 -
extra/jemalloc/test/rallocm.exp | 2 -
extra/jemalloc/test/thread_arena.c | 81 -
extra/jemalloc/test/thread_arena.exp | 2 -
extra/jemalloc/test/thread_tcache_enabled.c | 91 -
extra/jemalloc/test/thread_tcache_enabled.exp | 2 -
extra/replace.c | 4 +-
extra/yassl/README | 31 +-
extra/yassl/certs/ca-cert.pem | 100 +-
extra/yassl/certs/client-cert.der | Bin 782 -> 1198 bytes
extra/yassl/certs/client-cert.pem | 100 +-
extra/yassl/certs/client-key.der | Bin 319 -> 1192 bytes
extra/yassl/certs/client-keyEnc.pem | 34 +-
extra/yassl/certs/dsa1024.der | Bin 0 -> 448 bytes
extra/yassl/certs/dsa1024.pem | 12 +
extra/yassl/certs/dsa512.der | Bin 249 -> 0 bytes
extra/yassl/certs/dsa512.pem | 8 -
extra/yassl/certs/server-cert.pem | 210 +-
extra/yassl/certs/server-keyEnc.pem | 52 +-
extra/yassl/include/buffer.hpp | 18 +-
extra/yassl/include/openssl/ssl.h | 2 +-
extra/yassl/src/buffer.cpp | 113 +-
extra/yassl/src/handshake.cpp | 25 +-
extra/yassl/src/yassl_imp.cpp | 179 +-
extra/yassl/src/yassl_int.cpp | 7 +-
extra/yassl/taocrypt/include/asn.hpp | 11 +-
extra/yassl/taocrypt/include/block.hpp | 6 +-
extra/yassl/taocrypt/include/integer.hpp | 4 +-
extra/yassl/taocrypt/include/pwdbased.hpp | 3 +-
extra/yassl/taocrypt/include/runtime.hpp | 17 +-
extra/yassl/taocrypt/include/sha.hpp | 9 +-
extra/yassl/taocrypt/src/aes.cpp | 17 +-
extra/yassl/taocrypt/src/algebra.cpp | 6 +-
extra/yassl/taocrypt/src/arc4.cpp | 11 +-
extra/yassl/taocrypt/src/asn.cpp | 48 +-
extra/yassl/taocrypt/src/blowfish.cpp | 6 +-
extra/yassl/taocrypt/src/des.cpp | 11 +-
extra/yassl/taocrypt/src/integer.cpp | 31 +-
extra/yassl/taocrypt/src/md5.cpp | 10 +-
extra/yassl/taocrypt/src/misc.cpp | 12 +-
extra/yassl/taocrypt/src/rabbit.cpp | 10 +-
extra/yassl/taocrypt/src/random.cpp | 3 +-
extra/yassl/taocrypt/src/ripemd.cpp | 13 +-
extra/yassl/taocrypt/src/rsa.cpp | 2 +-
extra/yassl/taocrypt/src/sha.cpp | 11 +-
extra/yassl/taocrypt/src/twofish.cpp | 11 +-
include/my_bitmap.h | 1 +
include/my_check_opt.h | 4 +-
include/my_cpu.h | 44 +
include/my_pthread.h | 18 +-
include/my_sys.h | 1 +
include/myisam.h | 6 +
include/welcome_copyright_notice.h | 2 +-
libmysql/errmsg.c | 2 +-
libmysqld/lib_sql.cc | 3 +
mysql-test/disabled.def | 1 +
mysql-test/extra/rpl_tests/rpl_ddl.test | 4 +-
mysql-test/extra/rpl_tests/rpl_row_basic.test | 4 +-
mysql-test/include/mysqlhotcopy.inc | 2 +-
mysql-test/include/wait_until_count_sessions.inc | 2 +-
mysql-test/include/world.inc | 0
mysql-test/include/world_schema.inc | 0
mysql-test/lib/My/Platform.pm | 2 +
mysql-test/mysql-test-run.pl | 58 +-
mysql-test/r/create.result | 47 +
mysql-test/r/ctype_cp932.result | 35 +
mysql-test/r/ctype_utf16.result | 9 +
mysql-test/r/derived_opt.result | 154 +-
mysql-test/r/derived_view.result | 88 +
mysql-test/r/func_compress.result | 8 +
mysql-test/r/func_group.result | 33 +-
mysql-test/r/func_time.result | 24 +
mysql-test/r/gis-precise.result | 35 +-
mysql-test/r/gis.result | 6 +
mysql-test/r/group_by.result | 25 +
mysql-test/r/information_schema.result | 2 +
mysql-test/r/innodb_mrr_cpk,innodb_plugin.rdiff | 9 +
mysql-test/r/innodb_mrr_cpk.result | 48 +-
mysql-test/r/insert_update_autoinc-7150.result | 9 +
mysql-test/r/join_cache.result | 161 +-
mysql-test/r/join_nested_jcl6.result | 6 +-
mysql-test/r/join_outer.result | 23 +
mysql-test/r/join_outer_jcl6.result | 25 +-
mysql-test/r/kill-2.result | 10 +
mysql-test/r/kill_processlist-6619.result | 14 +
mysql-test/r/lock_sync.result | 51 +
mysql-test/r/log_errchk.result | 10 +
mysql-test/r/mdev6830.result | 49 +
mysql-test/r/myisam-metadata.result | 3 +-
mysql-test/r/openssl_1.result | 2 +
mysql-test/r/openssl_6975,tlsv10.result | 25 +
mysql-test/r/openssl_6975,tlsv12.result | 25 +
mysql-test/r/partition_error.result | 5 +
mysql-test/r/processlist.result | 10 +-
mysql-test/r/show_bad_definer-5553.result | 13 +
mysql-test/r/sp-bugs.result | 6 +
mysql-test/r/sp-innodb.result | 32 +
mysql-test/r/type_newdecimal.result | 9 +
mysql-test/r/type_time.result | 11 +
mysql-test/r/union.result | 20 +
mysql-test/r/variables.result | 9 +
mysql-test/r/windows.result | 5 +
mysql-test/suite.pm | 3 +
.../binlog/r/binlog_switch_inside_trans.result | 8 +-
.../suite/binlog/r/load_data_stm_view.result | 22 +
mysql-test/suite/binlog/t/binlog_grant.test | 2 +-
.../suite/binlog/t/binlog_switch_inside_trans.test | 6 +-
mysql-test/suite/binlog/t/load_data_stm_view.test | 20 +
mysql-test/suite/funcs_1/views/func_view.inc | 2 +-
mysql-test/suite/funcs_1/views/views_master.inc | 2 +-
mysql-test/suite/heap/btree_varchar_null.result | 6 +
mysql-test/suite/heap/btree_varchar_null.test | 7 +
mysql-test/suite/innodb/r/foreign-keys.result | 16 +
.../suite/innodb/r/innodb-stats-sample.result | 4 +
.../suite/innodb/r/innodb_corrupt_bit.result | 1 +
.../r/innodb_simulate_comp_failures_small.result | 2 +-
mysql-test/suite/innodb/r/insert_debug.result | 11 +
mysql-test/suite/innodb/r/sp_temp_table.result | 253 +
mysql-test/suite/innodb/r/strict_mode.result | 242 +
mysql-test/suite/innodb/t/foreign-keys.test | 31 +
.../innodb/t/innodb-change-buffer-recovery.test | 2 +
mysql-test/suite/innodb/t/innodb-stats-sample.test | 78 +
mysql-test/suite/innodb/t/innodb.test | 2 +-
mysql-test/suite/innodb/t/innodb_bug12400341.test | 2 +
mysql-test/suite/innodb/t/innodb_bug14147491.test | 3 +
mysql-test/suite/innodb/t/innodb_corrupt_bit.test | 17 +-
.../suite/innodb/t/innodb_information_schema.test | 2 +-
.../t/innodb_simulate_comp_failures_small.test | 4 +-
mysql-test/suite/innodb/t/insert_debug.test | 22 +
mysql-test/suite/innodb/t/sp_temp_table.test | 108 +
mysql-test/suite/innodb/t/strict_mode.test | 251 +
mysql-test/suite/maria/insert_select.result | 6 +
mysql-test/suite/maria/insert_select.test | 21 +
mysql-test/suite/perfschema/t/myisam_file_io.opt | 2 +-
mysql-test/suite/plugins/t/unix_socket.test | 10 +-
mysql-test/suite/rpl/extension/checksum.pl | 0
mysql-test/suite/rpl/r/myisam_external_lock.result | 12 +
...l_parallel_show_binlog_events_purge_logs.result | 1 -
.../suite/rpl/t/myisam_external_lock-slave.opt | 2 +
mysql-test/suite/rpl/t/myisam_external_lock.test | 24 +
mysql-test/suite/rpl/t/rpl_ddl.test | 4 +-
...rpl_parallel_show_binlog_events_purge_logs.test | 1 -
mysql-test/suite/rpl/t/rpl_row_basic_11bugs.test | 2 +-
mysql-test/suite/rpl/t/rpl_show_slave_hosts.test | 5 +
.../suite/storage_engine/trx/xa_recovery.test | 6 +-
.../r/innodb_stats_modified_counter_basic.result | 56 +
.../r/innodb_stats_traditional_basic.result | 92 +
.../suite/sys_vars/r/sql_log_bin_basic.result | 7 +-
.../t/innodb_stats_modified_counter_basic.test | 47 +
.../sys_vars/t/innodb_stats_traditional_basic.test | 65 +
mysql-test/suite/sys_vars/t/sql_log_bin_basic.test | 6 +-
mysql-test/suite/vcol/r/not_supported.result | 67 +
mysql-test/suite/vcol/t/not_supported.test | 58 +
mysql-test/t/create.test | 32 +
mysql-test/t/ctype_cp932.test | 29 +
mysql-test/t/ctype_utf16.test | 6 +
mysql-test/t/derived_opt.test | 93 +-
mysql-test/t/derived_view.test | 93 +
mysql-test/t/failed_auth_unixsocket.test | 10 +-
mysql-test/t/func_compress.test | 9 +
mysql-test/t/func_group.test | 39 +-
mysql-test/t/func_time.test | 18 +
mysql-test/t/gis-precise.test | 19 +-
mysql-test/t/gis.test | 5 +
mysql-test/t/group_by.test | 29 +
mysql-test/t/information_schema.test | 12 +-
mysql-test/t/innodb_mrr_cpk.test | 44 +-
mysql-test/t/insert_update_autoinc-7150.test | 8 +
mysql-test/t/join_cache.test | 129 +
mysql-test/t/join_outer.test | 24 +
mysql-test/t/kill-2-master.opt | 1 +
mysql-test/t/kill-2.test | 29 +
mysql-test/t/kill_processlist-6619.test | 17 +
mysql-test/t/lock_sync.test | 55 +
mysql-test/t/log_errchk.test | 64 +
mysql-test/t/mdev6830-master.opt | 1 +
mysql-test/t/mdev6830.test | 63 +
mysql-test/t/myisam-metadata.test | 11 +-
mysql-test/t/openssl_1.test | 15 +-
mysql-test/t/openssl_6975.combinations | 6 +
mysql-test/t/openssl_6975.test | 38 +
mysql-test/t/partition_error.test | 11 +
mysql-test/t/processlist.test | 19 +-
mysql-test/t/show_bad_definer-5553.test | 12 +
mysql-test/t/sp-bugs.test | 13 +
mysql-test/t/sp-innodb.test | 45 +
mysql-test/t/ssl.test | 2 +
mysql-test/t/ssl_8k_key-master.opt | 4 +-
mysql-test/t/ssl_compress.test | 2 +
mysql-test/t/type_newdecimal.test | 11 +
mysql-test/t/type_time.test | 11 +
mysql-test/t/union.test | 20 +
mysql-test/t/variables.test | 8 +
mysql-test/t/windows.test | 16 +
mysys/default.c | 2 +-
mysys/mf_fn_ext.c | 43 +-
mysys/my_wincond.c | 24 +-
mysys/thr_lock.c | 16 +-
packaging/rpm-oel/mysql-systemd-start | 22 +-
packaging/rpm-oel/mysql.init | 8 +-
packaging/rpm-oel/mysql.spec.in | 33 +-
plugin/auth_socket/CMakeLists.txt | 53 +-
plugin/auth_socket/auth_socket.c | 26 +-
plugin/handler_socket/handlersocket/database.cpp | 2 +
.../handler_socket/handlersocket/handlersocket.cpp | 2 +
plugin/handler_socket/handlersocket/hstcpsvr.cpp | 2 +
plugin/handler_socket/libhsclient/hstcpcli.cpp | 2 +
plugin/handler_socket/libhsclient/socket.cpp | 2 +
.../perl-Net-HandlerSocket/HandlerSocket.xs | 9 +-
plugin/server_audit/server_audit.c | 2 +
scripts/CMakeLists.txt | 7 -
scripts/mysql_config.sh | 4 +-
scripts/mysql_install_db.sh | 4 +-
scripts/mysql_setpermission.sh | 6 +-
scripts/mysql_system_tables_fix.sql | 17 +
scripts/mysqlhotcopy.sh | 3 +
sql-common/client.c | 6 +
sql/CMakeLists.txt | 21 +-
sql/event_scheduler.cc | 9 +-
sql/ha_partition.cc | 5 +-
sql/handler.cc | 11 +-
sql/handler.h | 3 +
sql/item.cc | 46 +-
sql/item.h | 3 +-
sql/item_func.cc | 23 +-
sql/item_func.h | 11 +-
sql/item_strfunc.cc | 27 +-
sql/item_sum.cc | 14 +-
sql/item_timefunc.cc | 22 +-
sql/item_timefunc.h | 9 +-
sql/log.cc | 5 +
sql/log_event.cc | 19 +-
sql/log_event.h | 4 +-
sql/multi_range_read.cc | 25 +-
sql/multi_range_read.h | 6 +
sql/mysqld.cc | 14 +-
sql/mysqld.h | 1 +
sql/opt_range.cc | 30 +-
sql/slave.h | 10 +-
sql/sp_head.cc | 6 +-
sql/spatial.cc | 8 +-
sql/sql_acl.cc | 2 +-
sql/sql_base.cc | 1 -
sql/sql_cache.cc | 2 +-
sql/sql_insert.cc | 2 +-
sql/sql_join_cache.cc | 2 +-
sql/sql_lex.h | 9 +
sql/sql_load.cc | 24 +-
sql/sql_parse.cc | 117 +-
sql/sql_parse.h | 3 +
sql/sql_priv.h | 31 +-
sql/sql_select.cc | 100 +-
sql/sql_show.cc | 138 +-
sql/sql_string.h | 4 +-
sql/sql_table.cc | 16 +-
sql/sql_union.cc | 24 +-
sql/sql_yacc.cc | 35216 +++---
sql/sql_yacc.h | 3 +-
sql/sql_yacc.yy | 31 +-
sql/sys_vars.cc | 28 +-
sql/table.cc | 49 +-
sql/table.h | 2 +
storage/example/ha_example.cc | 1 +
storage/federatedx/federatedx_io.cc | 1 +
storage/federatedx/federatedx_io_mysql.cc | 1 +
storage/federatedx/federatedx_io_null.cc | 1 +
storage/federatedx/federatedx_txn.cc | 1 +
storage/federatedx/ha_federatedx.cc | 1 +
storage/heap/hp_hash.c | 5 +
storage/innobase/CMakeLists.txt | 47 +
storage/innobase/btr/btr0cur.c | 65 +-
storage/innobase/buf/buf0buf.c | 1 +
storage/innobase/buf/buf0flu.c | 10 +-
storage/innobase/dict/dict0dict.c | 57 +-
storage/innobase/dict/dict0load.c | 1 +
storage/innobase/handler/ha_innodb.cc | 66 +-
storage/innobase/include/btr0cur.ic | 4 +-
storage/innobase/include/dict0dict.h | 20 +-
storage/innobase/include/dict0dict.ic | 12 +
storage/innobase/include/log0log.h | 7 +
storage/innobase/include/log0log.ic | 20 +
storage/innobase/include/os0sync.h | 91 +-
storage/innobase/include/os0sync.ic | 32 +
storage/innobase/include/srv0srv.h | 2 +
storage/innobase/include/sync0arr.h | 6 +
storage/innobase/include/sync0rw.h | 8 +-
storage/innobase/include/sync0rw.ic | 13 +-
storage/innobase/include/sync0sync.h | 5 +
storage/innobase/include/sync0sync.ic | 8 +-
.../mysql-test/storage_engine/disabled.def | 1 -
storage/innobase/os/os0sync.c | 19 +
storage/innobase/row/row0ins.c | 12 +-
storage/innobase/row/row0mysql.c | 9 +-
storage/innobase/srv/srv0srv.c | 20 +-
storage/innobase/sync/sync0arr.c | 68 +-
storage/innobase/sync/sync0rw.c | 61 +-
storage/innobase/sync/sync0sync.c | 27 +-
storage/maria/ha_maria.cc | 29 +-
storage/myisam/ftbench/ft-test-run.sh | 2 +-
storage/myisam/ha_myisam.cc | 30 +-
storage/myisam/mi_rnext.c | 2 +-
.../storage_engine/alter_table_online.rdiff | 44 +
.../mysql-test/storage_engine/disabled.def | 2 -
storage/sphinx/snippets_udf.cc | 1 +
storage/tokudb/CMakeLists.txt | 46 +-
storage/tokudb/README.md | 14 +-
storage/tokudb/ft-index/CMakeLists.txt | 3 -
storage/tokudb/ft-index/CTestCustom.cmake | 241 +
storage/tokudb/ft-index/CTestCustom.cmake.in | 244 -
storage/tokudb/ft-index/README-TOKUDB | 2 +-
storage/tokudb/ft-index/README.md | 38 +-
storage/tokudb/ft-index/buildheader/CMakeLists.txt | 2 +-
storage/tokudb/ft-index/buildheader/make_tdb.cc | 18 +-
.../ft-index/cmake/merge_archives_unix.cmake.in | 12 +-
.../tokudb/ft-index/cmake_modules/FindBDB.cmake | 27 -
.../cmake_modules/TokuBuildTagDatabases.cmake | 126 -
.../cmake_modules/TokuFeatureDetection.cmake | 5 -
.../ft-index/cmake_modules/TokuMergeLibs.cmake | 38 +-
.../ft-index/cmake_modules/TokuSetupCompiler.cmake | 17 +-
storage/tokudb/ft-index/examples/CMakeLists.txt | 16 -
storage/tokudb/ft-index/examples/Makefile | 29 -
storage/tokudb/ft-index/examples/README.examples | 85 -
.../tokudb/ft-index/examples/db-insert-multiple.c | 510 -
storage/tokudb/ft-index/examples/db-insert.c | 610 -
storage/tokudb/ft-index/examples/db-scan.c | 461 -
storage/tokudb/ft-index/examples/db-update.c | 379 -
storage/tokudb/ft-index/ft/CMakeLists.txt | 95 +-
.../tokudb/ft-index/ft/background_job_manager.cc | 159 -
.../tokudb/ft-index/ft/background_job_manager.h | 134 -
storage/tokudb/ft-index/ft/block_allocator.cc | 473 -
storage/tokudb/ft-index/ft/block_allocator.h | 230 -
storage/tokudb/ft-index/ft/block_table.cc | 1199 -
storage/tokudb/ft-index/ft/block_table.h | 176 -
storage/tokudb/ft-index/ft/bndata.cc | 33 +-
storage/tokudb/ft-index/ft/bndata.h | 16 +-
storage/tokudb/ft-index/ft/cachetable-internal.h | 658 -
storage/tokudb/ft-index/ft/cachetable.cc | 4981 -
storage/tokudb/ft-index/ft/cachetable.h | 605 -
.../ft/cachetable/background_job_manager.cc | 159 +
.../ft/cachetable/background_job_manager.h | 132 +
.../ft-index/ft/cachetable/cachetable-internal.h | 654 +
.../tokudb/ft-index/ft/cachetable/cachetable.cc | 4975 +
storage/tokudb/ft-index/ft/cachetable/cachetable.h | 649 +
.../tokudb/ft-index/ft/cachetable/checkpoint.cc | 405 +
storage/tokudb/ft-index/ft/cachetable/checkpoint.h | 200 +
storage/tokudb/ft-index/ft/checkpoint.cc | 402 -
storage/tokudb/ft-index/ft/checkpoint.h | 205 -
storage/tokudb/ft-index/ft/comparator.h | 122 +-
storage/tokudb/ft-index/ft/compress.cc | 294 -
storage/tokudb/ft-index/ft/compress.h | 135 -
storage/tokudb/ft-index/ft/cursor.cc | 507 +
storage/tokudb/ft-index/ft/cursor.h | 237 +
storage/tokudb/ft-index/ft/dbufio.cc | 628 -
storage/tokudb/ft-index/ft/dbufio.h | 112 -
storage/tokudb/ft-index/ft/fifo.cc | 253 -
storage/tokudb/ft-index/ft/fifo.h | 182 -
.../tokudb/ft-index/ft/ft-cachetable-wrappers.cc | 69 +-
.../tokudb/ft-index/ft/ft-cachetable-wrappers.h | 31 +-
storage/tokudb/ft-index/ft/ft-flusher-internal.h | 20 +-
storage/tokudb/ft-index/ft/ft-flusher.cc | 631 +-
storage/tokudb/ft-index/ft/ft-flusher.h | 50 +-
storage/tokudb/ft-index/ft/ft-hot-flusher.cc | 49 +-
storage/tokudb/ft-index/ft/ft-internal.h | 973 +-
storage/tokudb/ft-index/ft/ft-node-deserialize.cc | 238 -
storage/tokudb/ft-index/ft/ft-ops.cc | 6104 +-
storage/tokudb/ft-index/ft/ft-ops.h | 98 +-
storage/tokudb/ft-index/ft/ft-search.h | 158 -
storage/tokudb/ft-index/ft/ft-serialize.cc | 861 -
storage/tokudb/ft-index/ft/ft-test-helpers.cc | 109 +-
storage/tokudb/ft-index/ft/ft-verify.cc | 238 +-
storage/tokudb/ft-index/ft/ft.cc | 302 +-
storage/tokudb/ft-index/ft/ft.h | 68 +-
storage/tokudb/ft-index/ft/ft_layout_version.h | 134 -
storage/tokudb/ft-index/ft/ft_msg.cc | 133 -
storage/tokudb/ft-index/ft/ft_msg.h | 124 -
storage/tokudb/ft-index/ft/ft_node-serialize.cc | 3214 -
storage/tokudb/ft-index/ft/ftloader-callback.cc | 199 -
storage/tokudb/ft-index/ft/ftloader-internal.h | 366 -
storage/tokudb/ft-index/ft/ftloader.cc | 3345 -
storage/tokudb/ft-index/ft/ftloader.h | 135 -
storage/tokudb/ft-index/ft/fttypes.h | 382 -
storage/tokudb/ft-index/ft/ftverify.cc | 507 -
storage/tokudb/ft-index/ft/key.cc | 189 -
storage/tokudb/ft-index/ft/key.h | 104 -
storage/tokudb/ft-index/ft/le-cursor.cc | 25 +-
storage/tokudb/ft-index/ft/le-cursor.h | 11 +-
storage/tokudb/ft-index/ft/leafentry.cc | 4 +-
storage/tokudb/ft-index/ft/leafentry.h | 28 +-
storage/tokudb/ft-index/ft/loader/callbacks.cc | 199 +
storage/tokudb/ft-index/ft/loader/dbufio.cc | 631 +
storage/tokudb/ft-index/ft/loader/dbufio.h | 110 +
.../tokudb/ft-index/ft/loader/loader-internal.h | 365 +
storage/tokudb/ft-index/ft/loader/loader.cc | 3342 +
storage/tokudb/ft-index/ft/loader/loader.h | 138 +
storage/tokudb/ft-index/ft/loader/pqueue.cc | 235 +
storage/tokudb/ft-index/ft/loader/pqueue.h | 123 +
storage/tokudb/ft-index/ft/log-internal.h | 375 -
storage/tokudb/ft-index/ft/log.h | 134 -
storage/tokudb/ft-index/ft/log_upgrade.cc | 346 -
storage/tokudb/ft-index/ft/logcursor.cc | 553 -
storage/tokudb/ft-index/ft/logcursor.h | 132 -
storage/tokudb/ft-index/ft/logfilemgr.cc | 260 -
storage/tokudb/ft-index/ft/logfilemgr.h | 123 -
storage/tokudb/ft-index/ft/logformat.cc | 881 -
storage/tokudb/ft-index/ft/logger.cc | 1469 -
storage/tokudb/ft-index/ft/logger.h | 264 -
storage/tokudb/ft-index/ft/logger/log-internal.h | 279 +
storage/tokudb/ft-index/ft/logger/log.h | 123 +
storage/tokudb/ft-index/ft/logger/log_upgrade.cc | 348 +
storage/tokudb/ft-index/ft/logger/logcursor.cc | 551 +
storage/tokudb/ft-index/ft/logger/logcursor.h | 128 +
storage/tokudb/ft-index/ft/logger/logfilemgr.cc | 259 +
storage/tokudb/ft-index/ft/logger/logfilemgr.h | 119 +
storage/tokudb/ft-index/ft/logger/logformat.cc | 880 +
storage/tokudb/ft-index/ft/logger/logger.cc | 1487 +
storage/tokudb/ft-index/ft/logger/logger.h | 341 +
storage/tokudb/ft-index/ft/logger/recover.cc | 1679 +
storage/tokudb/ft-index/ft/logger/recover.h | 139 +
storage/tokudb/ft-index/ft/minicron.cc | 248 -
storage/tokudb/ft-index/ft/minicron.h | 132 -
storage/tokudb/ft-index/ft/msg.cc | 171 +
storage/tokudb/ft-index/ft/msg.h | 246 +
storage/tokudb/ft-index/ft/msg_buffer.cc | 318 +
storage/tokudb/ft-index/ft/msg_buffer.h | 181 +
storage/tokudb/ft-index/ft/node.cc | 1982 +
storage/tokudb/ft-index/ft/node.h | 588 +
storage/tokudb/ft-index/ft/pivotkeys.cc | 493 +
storage/tokudb/ft-index/ft/pqueue.cc | 233 -
storage/tokudb/ft-index/ft/pqueue.h | 126 -
storage/tokudb/ft-index/ft/queue.cc | 232 -
storage/tokudb/ft-index/ft/queue.h | 140 -
storage/tokudb/ft-index/ft/quicklz.cc | 939 -
storage/tokudb/ft-index/ft/quicklz.h | 233 -
storage/tokudb/ft-index/ft/rbuf.h | 280 -
storage/tokudb/ft-index/ft/recover.cc | 1678 -
storage/tokudb/ft-index/ft/recover.h | 143 -
storage/tokudb/ft-index/ft/roll.cc | 636 -
storage/tokudb/ft-index/ft/rollback-apply.cc | 305 -
storage/tokudb/ft-index/ft/rollback-apply.h | 104 -
.../tokudb/ft-index/ft/rollback-ct-callbacks.cc | 313 -
storage/tokudb/ft-index/ft/rollback-ct-callbacks.h | 139 -
storage/tokudb/ft-index/ft/rollback.cc | 386 -
storage/tokudb/ft-index/ft/rollback.h | 195 -
.../tokudb/ft-index/ft/rollback_log_node_cache.cc | 160 -
.../tokudb/ft-index/ft/rollback_log_node_cache.h | 119 -
.../ft-index/ft/serialize/block_allocator.cc | 513 +
.../tokudb/ft-index/ft/serialize/block_allocator.h | 267 +
.../ft/serialize/block_allocator_strategy.cc | 274 +
.../ft/serialize/block_allocator_strategy.h | 115 +
.../tokudb/ft-index/ft/serialize/block_table.cc | 1048 +
storage/tokudb/ft-index/ft/serialize/block_table.h | 338 +
storage/tokudb/ft-index/ft/serialize/compress.cc | 297 +
storage/tokudb/ft-index/ft/serialize/compress.h | 131 +
.../ft-index/ft/serialize/ft-node-deserialize.cc | 241 +
.../tokudb/ft-index/ft/serialize/ft-serialize.cc | 858 +
.../tokudb/ft-index/ft/serialize/ft-serialize.h | 112 +
.../ft-index/ft/serialize/ft_layout_version.h | 132 +
.../ft-index/ft/serialize/ft_node-serialize.cc | 2927 +
.../ft-index/ft/serialize/ft_node-serialize.h | 142 +
storage/tokudb/ft-index/ft/serialize/quicklz.cc | 939 +
storage/tokudb/ft-index/ft/serialize/quicklz.h | 230 +
storage/tokudb/ft-index/ft/serialize/rbuf.h | 210 +
storage/tokudb/ft-index/ft/serialize/sub_block.cc | 444 +
storage/tokudb/ft-index/ft/serialize/sub_block.h | 214 +
storage/tokudb/ft-index/ft/serialize/wbuf.h | 262 +
storage/tokudb/ft-index/ft/serialize/workset.h | 189 +
storage/tokudb/ft-index/ft/sub_block.cc | 442 -
storage/tokudb/ft-index/ft/sub_block.h | 217 -
storage/tokudb/ft-index/ft/sub_block_map.h | 127 -
storage/tokudb/ft-index/ft/tdb-recover.cc | 136 -
storage/tokudb/ft-index/ft/tdb_logprint.cc | 125 -
storage/tokudb/ft-index/ft/tests/CMakeLists.txt | 16 +
storage/tokudb/ft-index/ft/tests/benchmark-test.cc | 6 +-
.../ft/tests/block_allocator_strategy_test.cc | 176 +
.../ft-index/ft/tests/block_allocator_test.cc | 140 +-
.../ft-index/ft/tests/bnc-insert-benchmark.cc | 13 +-
.../tokudb/ft-index/ft/tests/cachetable-4357.cc | 4 +-
.../tokudb/ft-index/ft/tests/cachetable-4365.cc | 4 +-
.../tokudb/ft-index/ft/tests/cachetable-5097.cc | 4 +-
.../tokudb/ft-index/ft/tests/cachetable-5978-2.cc | 4 +-
.../tokudb/ft-index/ft/tests/cachetable-5978.cc | 4 +-
.../ft-index/ft/tests/cachetable-all-write.cc | 4 +-
.../ft/tests/cachetable-checkpoint-pending.cc | 6 +-
.../ft/tests/cachetable-checkpoint-pinned-nodes.cc | 4 +-
.../cachetable-checkpoint-prefetched-nodes.cc | 4 +-
.../ft/tests/cachetable-checkpoint-test.cc | 6 +-
.../ft/tests/cachetable-checkpointer-class.cc | 44 +-
.../ft/tests/cachetable-cleaner-checkpoint.cc | 4 +-
.../ft/tests/cachetable-cleaner-checkpoint2.cc | 4 +-
.../cachetable-cleaner-thread-attrs-accumulate.cc | 4 +-
.../cachetable-cleaner-thread-empty-cachetable.cc | 4 +-
.../cachetable-cleaner-thread-everything-pinned.cc | 4 +-
...etable-cleaner-thread-nothing-needs-flushing.cc | 4 +-
.../cachetable-cleaner-thread-same-fullhash.cc | 4 +-
.../ft/tests/cachetable-cleaner-thread-simple.cc | 4 +-
.../ft/tests/cachetable-clock-all-pinned.cc | 4 +-
.../ft-index/ft/tests/cachetable-clock-eviction.cc | 4 +-
.../ft/tests/cachetable-clock-eviction2.cc | 4 +-
.../ft/tests/cachetable-clock-eviction3.cc | 4 +-
.../ft/tests/cachetable-clock-eviction4.cc | 4 +-
.../ft/tests/cachetable-clone-checkpoint.cc | 4 +-
.../cachetable-clone-partial-fetch-pinned-node.cc | 4 +-
.../ft/tests/cachetable-clone-partial-fetch.cc | 4 +-
.../ft/tests/cachetable-clone-pin-nonblocking.cc | 4 +-
.../ft/tests/cachetable-clone-unpin-remove.cc | 4 +-
.../ft/tests/cachetable-count-pinned-test.cc | 4 +-
.../ft-index/ft/tests/cachetable-debug-test.cc | 4 +-
.../ft/tests/cachetable-eviction-close-test.cc | 4 +-
.../ft/tests/cachetable-eviction-close-test2.cc | 4 +-
.../ft/tests/cachetable-eviction-getandpin-test.cc | 4 +-
.../tests/cachetable-eviction-getandpin-test2.cc | 4 +-
.../ft-index/ft/tests/cachetable-evictor-class.cc | 4 +-
.../tokudb/ft-index/ft/tests/cachetable-fd-test.cc | 4 +-
.../ft/tests/cachetable-fetch-inducing-evictor.cc | 4 +-
.../ft/tests/cachetable-flush-during-cleaner.cc | 4 +-
.../ft-index/ft/tests/cachetable-flush-test.cc | 4 +-
.../ft-index/ft/tests/cachetable-getandpin-test.cc | 4 +-
.../cachetable-kibbutz_and_flush_cachefile.cc | 4 +-
.../ft-index/ft/tests/cachetable-partial-fetch.cc | 6 +-
.../ft-index/ft/tests/cachetable-pin-checkpoint.cc | 4 +-
.../cachetable-pin-nonblocking-checkpoint-clean.cc | 4 +-
.../tests/cachetable-prefetch-checkpoint-test.cc | 6 +-
.../tests/cachetable-prefetch-close-leak-test.cc | 4 +-
.../ft/tests/cachetable-prefetch-close-test.cc | 4 +-
.../tests/cachetable-prefetch-flowcontrol-test.cc | 6 +-
.../ft/tests/cachetable-prefetch-getandpin-test.cc | 4 +-
.../cachetable-prefetch-maybegetandpin-test.cc | 4 +-
.../ft-index/ft/tests/cachetable-prefetch2-test.cc | 4 +-
.../ft-index/ft/tests/cachetable-put-checkpoint.cc | 4 +-
.../ft-index/ft/tests/cachetable-put-test.cc | 4 +-
.../ft-index/ft/tests/cachetable-rwlock-test.cc | 2 +-
.../ft-index/ft/tests/cachetable-simple-clone.cc | 4 +-
.../ft-index/ft/tests/cachetable-simple-clone2.cc | 4 +-
.../ft-index/ft/tests/cachetable-simple-close.cc | 10 +-
.../ft/tests/cachetable-simple-maybe-get-pin.cc | 4 +-
.../ft/tests/cachetable-simple-pin-cheap.cc | 4 +-
.../ft/tests/cachetable-simple-pin-dep-nodes.cc | 4 +-
.../cachetable-simple-pin-nonblocking-cheap.cc | 4 +-
.../ft/tests/cachetable-simple-pin-nonblocking.cc | 4 +-
.../ft-index/ft/tests/cachetable-simple-pin.cc | 4 +-
.../ft/tests/cachetable-simple-put-dep-nodes.cc | 4 +-
.../cachetable-simple-read-pin-nonblocking.cc | 4 +-
.../ft/tests/cachetable-simple-read-pin.cc | 4 +-
.../cachetable-simple-unpin-remove-checkpoint.cc | 4 +-
.../ft-index/ft/tests/cachetable-simple-verify.cc | 4 +-
.../tokudb/ft-index/ft/tests/cachetable-test.cc | 14 +-
storage/tokudb/ft-index/ft/tests/cachetable-test.h | 7 +-
.../ft/tests/cachetable-unpin-and-remove-test.cc | 6 +-
.../cachetable-unpin-remove-and-checkpoint.cc | 4 +-
.../ft-index/ft/tests/cachetable-unpin-test.cc | 6 +-
.../ft/tests/cachetable-writer-thread-limit.cc | 4 +-
.../tokudb/ft-index/ft/tests/comparator-test.cc | 39 +-
storage/tokudb/ft-index/ft/tests/compress-test.cc | 4 +-
.../ft-index/ft/tests/dbufio-test-destroy.cc | 4 +-
storage/tokudb/ft-index/ft/tests/dbufio-test.cc | 4 +-
storage/tokudb/ft-index/ft/tests/dmt-test.cc | 2 +-
storage/tokudb/ft-index/ft/tests/dmt-test2.cc | 2 +-
storage/tokudb/ft-index/ft/tests/fifo-test.cc | 129 +-
storage/tokudb/ft-index/ft/tests/ft-bfe-query.cc | 85 +-
storage/tokudb/ft-index/ft/tests/ft-clock-test.cc | 117 +-
.../ft-index/ft/tests/ft-serialize-benchmark.cc | 89 +-
.../ft/tests/ft-serialize-sub-block-test.cc | 4 +-
.../tokudb/ft-index/ft/tests/ft-serialize-test.cc | 328 +-
.../tokudb/ft-index/ft/tests/ft-test-cursor-2.cc | 8 +-
storage/tokudb/ft-index/ft/tests/ft-test-cursor.cc | 31 +-
storage/tokudb/ft-index/ft/tests/ft-test-header.cc | 6 +-
storage/tokudb/ft-index/ft/tests/ft-test.cc | 51 +-
storage/tokudb/ft-index/ft/tests/ft-test0.cc | 5 +-
storage/tokudb/ft-index/ft/tests/ft-test1.cc | 5 +-
storage/tokudb/ft-index/ft/tests/ft-test2.cc | 5 +-
storage/tokudb/ft-index/ft/tests/ft-test3.cc | 5 +-
storage/tokudb/ft-index/ft/tests/ft-test4.cc | 5 +-
storage/tokudb/ft-index/ft/tests/ft-test5.cc | 7 +-
.../ft-index/ft/tests/ftloader-error-injector.h | 9 +-
.../ft/tests/ftloader-test-bad-generate.cc | 8 +-
.../ft/tests/ftloader-test-extractor-errors.cc | 8 +-
.../ft-index/ft/tests/ftloader-test-extractor.cc | 8 +-
.../ft/tests/ftloader-test-merge-files-dbufio.cc | 12 +-
.../tokudb/ft-index/ft/tests/ftloader-test-open.cc | 6 +-
.../tokudb/ft-index/ft/tests/ftloader-test-vm.cc | 4 +-
.../ft/tests/ftloader-test-writer-errors.cc | 18 +-
.../ft-index/ft/tests/ftloader-test-writer.cc | 20 +-
storage/tokudb/ft-index/ft/tests/ftloader-test.cc | 14 +-
.../ft/tests/generate-upgrade-recovery-logs.cc | 151 +
storage/tokudb/ft-index/ft/tests/is_empty.cc | 4 +-
storage/tokudb/ft-index/ft/tests/keyrange.cc | 5 +-
storage/tokudb/ft-index/ft/tests/keytest.cc | 11 +-
.../tokudb/ft-index/ft/tests/le-cursor-provdel.cc | 8 +-
.../tokudb/ft-index/ft/tests/le-cursor-right.cc | 13 +-
storage/tokudb/ft-index/ft/tests/le-cursor-walk.cc | 9 +-
storage/tokudb/ft-index/ft/tests/list-test.cc | 2 +-
.../ft-index/ft/tests/log-test-maybe-trim.cc | 4 +-
storage/tokudb/ft-index/ft/tests/log-test.cc | 2 +-
storage/tokudb/ft-index/ft/tests/log-test2.cc | 2 +-
storage/tokudb/ft-index/ft/tests/log-test3.cc | 2 +-
storage/tokudb/ft-index/ft/tests/log-test4.cc | 2 +-
storage/tokudb/ft-index/ft/tests/log-test5.cc | 2 +-
storage/tokudb/ft-index/ft/tests/log-test6.cc | 2 +-
storage/tokudb/ft-index/ft/tests/log-test7.cc | 2 +-
.../ft-index/ft/tests/logcursor-bad-checksum.cc | 4 +-
storage/tokudb/ft-index/ft/tests/logcursor-bw.cc | 2 +-
.../ft-index/ft/tests/logcursor-empty-logdir.cc | 4 +-
.../ft-index/ft/tests/logcursor-empty-logfile-2.cc | 4 +-
.../ft-index/ft/tests/logcursor-empty-logfile-3.cc | 4 +-
.../ft-index/ft/tests/logcursor-empty-logfile.cc | 4 +-
storage/tokudb/ft-index/ft/tests/logcursor-fw.cc | 2 +-
.../tokudb/ft-index/ft/tests/logcursor-print.cc | 4 +-
.../ft-index/ft/tests/logcursor-timestamp.cc | 4 +-
.../ft-index/ft/tests/logfilemgr-create-destroy.cc | 7 +-
.../tokudb/ft-index/ft/tests/logfilemgr-print.cc | 6 +-
storage/tokudb/ft-index/ft/tests/make-tree.cc | 12 +-
storage/tokudb/ft-index/ft/tests/mempool-115.cc | 22 +-
storage/tokudb/ft-index/ft/tests/minicron-test.cc | 272 -
storage/tokudb/ft-index/ft/tests/msnfilter.cc | 22 +-
.../tokudb/ft-index/ft/tests/orthopush-flush.cc | 563 +-
storage/tokudb/ft-index/ft/tests/pqueue-test.cc | 6 +-
storage/tokudb/ft-index/ft/tests/queue-test.cc | 185 -
storage/tokudb/ft-index/ft/tests/quicklz-test.cc | 4 +-
.../ft-index/ft/tests/recovery-bad-last-entry.cc | 4 +-
.../ft/tests/recovery-cbegin-cend-hello.cc | 4 +-
.../ft-index/ft/tests/recovery-cbegin-cend.cc | 4 +-
.../tokudb/ft-index/ft/tests/recovery-cbegin.cc | 4 +-
.../ft-index/ft/tests/recovery-cend-cbegin.cc | 4 +-
.../ft-index/ft/tests/recovery-datadir-is-file.cc | 4 +-
storage/tokudb/ft-index/ft/tests/recovery-empty.cc | 4 +-
.../ft/tests/recovery-fopen-missing-file.cc | 6 +-
storage/tokudb/ft-index/ft/tests/recovery-hello.cc | 4 +-
.../recovery-lsn-error-during-forward-scan.cc | 4 +-
.../ft-index/ft/tests/recovery-no-datadir.cc | 4 +-
.../tokudb/ft-index/ft/tests/recovery-no-log.cc | 4 +-
.../tokudb/ft-index/ft/tests/recovery-no-logdir.cc | 4 +-
.../tokudb/ft-index/ft/tests/recovery-test5123.cc | 4 +-
storage/tokudb/ft-index/ft/tests/shortcut.cc | 4 +-
.../ft-index/ft/tests/subblock-test-checksum.cc | 6 +-
.../ft-index/ft/tests/subblock-test-compression.cc | 4 +-
.../ft-index/ft/tests/subblock-test-index.cc | 4 +-
.../tokudb/ft-index/ft/tests/subblock-test-size.cc | 4 +-
storage/tokudb/ft-index/ft/tests/test-assert.cc | 2 +-
storage/tokudb/ft-index/ft/tests/test-bjm.cc | 4 +-
.../ft/tests/test-checkpoint-during-flush.cc | 13 +-
.../ft/tests/test-checkpoint-during-merge.cc | 13 +-
.../ft/tests/test-checkpoint-during-rebalance.cc | 13 +-
.../ft/tests/test-checkpoint-during-split.cc | 13 +-
.../tokudb/ft-index/ft/tests/test-del-inorder.cc | 5 +-
.../ft/tests/test-dirty-flushes-on-cleaner.cc | 17 +-
storage/tokudb/ft-index/ft/tests/test-dump-ft.cc | 5 +-
.../ft-index/ft/tests/test-flushes-on-cleaner.cc | 19 +-
.../tokudb/ft-index/ft/tests/test-ft-overflow.cc | 5 +-
storage/tokudb/ft-index/ft/tests/test-ft-txns.h | 10 +-
.../ft-index/ft/tests/test-hot-with-bounds.cc | 13 +-
storage/tokudb/ft-index/ft/tests/test-inc-split.cc | 5 +-
.../ft-index/ft/tests/test-leafentry-child-txn.cc | 94 +-
.../ft-index/ft/tests/test-leafentry-nested.cc | 212 +-
.../ft-index/ft/tests/test-merges-on-cleaner.cc | 13 +-
.../ft/tests/test-oldest-referenced-xid-flush.cc | 8 +-
.../ft-index/ft/tests/test-pick-child-to-flush.cc | 19 +-
.../ft-index/ft/tests/test-txn-child-manager.cc | 4 +-
.../ft/tests/test-upgrade-recovery-logs.cc | 193 +
storage/tokudb/ft-index/ft/tests/test.h | 49 +-
storage/tokudb/ft-index/ft/tests/test1308a.cc | 2 +-
storage/tokudb/ft-index/ft/tests/test3681.cc | 7 +-
storage/tokudb/ft-index/ft/tests/test3856.cc | 11 +-
storage/tokudb/ft-index/ft/tests/test3884.cc | 84 +-
storage/tokudb/ft-index/ft/tests/test4115.cc | 5 +-
storage/tokudb/ft-index/ft/tests/test4244.cc | 9 +-
.../ft/tests/test_block_allocator_merge.cc | 236 -
storage/tokudb/ft-index/ft/tests/test_logcursor.cc | 6 +-
storage/tokudb/ft-index/ft/tests/test_oexcl.cc | 2 +-
.../test_rightmost_leaf_seqinsert_heuristic.cc | 6 +-
.../ft/tests/test_rightmost_leaf_split_merge.cc | 15 +-
.../ft/tests/test_toku_malloc_plain_free.cc | 2 +-
.../ft-index/ft/tests/upgrade_test_simple.cc | 9 +-
storage/tokudb/ft-index/ft/tests/verify-bad-msn.cc | 12 +-
.../tokudb/ft-index/ft/tests/verify-bad-pivots.cc | 10 +-
.../tokudb/ft-index/ft/tests/verify-dup-in-leaf.cc | 10 +-
.../tokudb/ft-index/ft/tests/verify-dup-pivots.cc | 10 +-
.../ft-index/ft/tests/verify-misrouted-msgs.cc | 12 +-
.../ft-index/ft/tests/verify-unsorted-leaf.cc | 10 +-
.../ft-index/ft/tests/verify-unsorted-pivots.cc | 10 +-
.../ft-index/ft/tests/xid_lsn_independent.cc | 4 +-
storage/tokudb/ft-index/ft/tests/ybt-test.cc | 14 +-
storage/tokudb/ft-index/ft/tokuconst.h | 108 -
storage/tokudb/ft-index/ft/tokuftdump.cc | 701 -
storage/tokudb/ft-index/ft/txn.cc | 795 -
storage/tokudb/ft-index/ft/txn.h | 225 -
storage/tokudb/ft-index/ft/txn/roll.cc | 634 +
storage/tokudb/ft-index/ft/txn/rollback-apply.cc | 308 +
storage/tokudb/ft-index/ft/txn/rollback-apply.h | 101 +
.../ft-index/ft/txn/rollback-ct-callbacks.cc | 315 +
.../tokudb/ft-index/ft/txn/rollback-ct-callbacks.h | 134 +
storage/tokudb/ft-index/ft/txn/rollback.cc | 387 +
storage/tokudb/ft-index/ft/txn/rollback.h | 199 +
.../ft-index/ft/txn/rollback_log_node_cache.cc | 162 +
.../ft-index/ft/txn/rollback_log_node_cache.h | 117 +
storage/tokudb/ft-index/ft/txn/txn.cc | 816 +
storage/tokudb/ft-index/ft/txn/txn.h | 435 +
.../tokudb/ft-index/ft/txn/txn_child_manager.cc | 196 +
storage/tokudb/ft-index/ft/txn/txn_child_manager.h | 120 +
storage/tokudb/ft-index/ft/txn/txn_manager.cc | 1050 +
storage/tokudb/ft-index/ft/txn/txn_manager.h | 268 +
storage/tokudb/ft-index/ft/txn/txn_state.h | 103 +
storage/tokudb/ft-index/ft/txn/xids.cc | 301 +
storage/tokudb/ft-index/ft/txn/xids.h | 170 +
storage/tokudb/ft-index/ft/txn_child_manager.cc | 194 -
storage/tokudb/ft-index/ft/txn_child_manager.h | 120 -
storage/tokudb/ft-index/ft/txn_manager.cc | 1045 -
storage/tokudb/ft-index/ft/txn_manager.h | 272 -
storage/tokudb/ft-index/ft/txn_state.h | 105 -
storage/tokudb/ft-index/ft/ule-internal.h | 14 +-
storage/tokudb/ft-index/ft/ule.cc | 226 +-
storage/tokudb/ft-index/ft/ule.h | 11 +-
storage/tokudb/ft-index/ft/valgrind.suppressions | 11 +
storage/tokudb/ft-index/ft/wbuf.h | 337 -
storage/tokudb/ft-index/ft/workset.h | 191 -
storage/tokudb/ft-index/ft/xids-internal.h | 108 -
storage/tokudb/ft-index/ft/xids.cc | 310 -
storage/tokudb/ft-index/ft/xids.h | 151 -
storage/tokudb/ft-index/ft/ybt.cc | 350 -
storage/tokudb/ft-index/ft/ybt.h | 141 -
.../tokudb/ft-index/locktree/concurrent_tree.cc | 4 +-
storage/tokudb/ft-index/locktree/concurrent_tree.h | 11 +-
storage/tokudb/ft-index/locktree/keyrange.cc | 290 +-
storage/tokudb/ft-index/locktree/keyrange.h | 15 +-
storage/tokudb/ft-index/locktree/lock_request.cc | 12 +-
storage/tokudb/ft-index/locktree/lock_request.h | 20 +-
storage/tokudb/ft-index/locktree/locktree.cc | 80 +-
storage/tokudb/ft-index/locktree/locktree.h | 41 +-
storage/tokudb/ft-index/locktree/manager.cc | 64 +-
storage/tokudb/ft-index/locktree/range_buffer.cc | 341 +-
storage/tokudb/ft-index/locktree/range_buffer.h | 190 +-
.../tests/concurrent_tree_create_destroy.cc | 2 +-
.../tests/concurrent_tree_lkr_acquire_release.cc | 12 +-
.../tests/concurrent_tree_lkr_insert_remove.cc | 17 +-
.../concurrent_tree_lkr_insert_serial_large.cc | 3 +-
.../tests/concurrent_tree_lkr_remove_all.cc | 4 +-
.../locktree/tests/concurrent_tree_unit_test.h | 4 +-
.../locktree/tests/lock_request_create_set.cc | 2 +-
.../locktree/tests/lock_request_get_set_keys.cc | 2 +-
.../ft-index/locktree/tests/lock_request_killed.cc | 4 +-
.../locktree/tests/lock_request_not_killed.cc | 4 +-
.../locktree/tests/lock_request_start_deadlock.cc | 4 +-
.../locktree/tests/lock_request_start_pending.cc | 4 +-
.../locktree/tests/lock_request_unit_test.h | 9 +-
.../tests/lock_request_wait_time_callback.cc | 4 +-
.../ft-index/locktree/tests/locktree_conflicts.cc | 4 +-
.../locktree/tests/locktree_create_destroy.cc | 4 +-
.../tests/locktree_escalation_1big7lt_1small.cc | 6 +-
.../locktree/tests/locktree_escalation_2big_1lt.cc | 9 +-
.../locktree/tests/locktree_escalation_2big_2lt.cc | 9 +-
.../tests/locktree_escalation_impossible.cc | 7 +-
.../locktree/tests/locktree_escalation_stalls.cc | 12 +-
.../ft-index/locktree/tests/locktree_infinity.cc | 4 +-
.../ft-index/locktree/tests/locktree_misc.cc | 22 +-
.../locktree/tests/locktree_overlapping_relock.cc | 10 +-
.../locktree/tests/locktree_simple_lock.cc | 6 +-
.../tests/locktree_single_txnid_optimization.cc | 10 +-
.../ft-index/locktree/tests/locktree_unit_test.h | 9 +-
.../locktree/tests/manager_create_destroy.cc | 2 +-
.../locktree/tests/manager_locktree_map.cc | 2 +-
.../tests/manager_parallel_locktree_get_release.cc | 145 +
.../ft-index/locktree/tests/manager_params.cc | 2 +-
.../locktree/tests/manager_reference_release_lt.cc | 25 +-
.../ft-index/locktree/tests/manager_status.cc | 7 +-
.../ft-index/locktree/tests/manager_unit_test.h | 9 +-
.../ft-index/locktree/tests/range_buffer_test.cc | 15 +-
storage/tokudb/ft-index/locktree/tests/test.h | 135 +-
.../ft-index/locktree/tests/txnid_set_test.cc | 2 +-
storage/tokudb/ft-index/locktree/tests/wfg_test.cc | 2 +-
storage/tokudb/ft-index/locktree/treenode.cc | 20 +-
storage/tokudb/ft-index/locktree/treenode.h | 27 +-
storage/tokudb/ft-index/locktree/txnid_set.cc | 2 +-
storage/tokudb/ft-index/locktree/txnid_set.h | 13 +-
storage/tokudb/ft-index/locktree/wfg.cc | 2 +-
storage/tokudb/ft-index/locktree/wfg.h | 16 +-
storage/tokudb/ft-index/portability/CMakeLists.txt | 1 -
storage/tokudb/ft-index/portability/file.cc | 6 +-
.../ft-index/portability/huge_page_detection.cc | 4 +-
storage/tokudb/ft-index/portability/memory.cc | 2 +-
storage/tokudb/ft-index/portability/memory.h | 9 +-
storage/tokudb/ft-index/portability/os_malloc.cc | 2 +-
storage/tokudb/ft-index/portability/portability.cc | 2 +-
storage/tokudb/ft-index/portability/rdtsc.h | 127 -
.../ft-index/portability/tests/rwlock_condvar.h | 2 +-
.../ft-index/portability/tests/test-active-cpus.cc | 2 +-
.../tests/test-cache-line-boundary-fails.cc | 2 +-
.../portability/tests/test-cpu-freq-openlimit17.cc | 2 +-
.../ft-index/portability/tests/test-cpu-freq.cc | 2 +-
.../portability/tests/test-filesystem-sizes.cc | 2 +-
.../ft-index/portability/tests/test-flock.cc | 2 +-
.../portability/tests/test-fsync-directory.cc | 2 +-
.../ft-index/portability/tests/test-fsync.cc | 3 +-
.../ft-index/portability/tests/test-gettime.cc | 2 +-
.../portability/tests/test-gettimeofday.cc | 2 +-
.../ft-index/portability/tests/test-hugepage.cc | 2 +-
.../ft-index/portability/tests/test-max-data.cc | 2 +-
.../portability/tests/test-memory-status.cc | 2 +-
.../ft-index/portability/tests/test-pagesize.cc | 2 +-
.../tests/test-pthread-rwlock-rdlock.cc | 2 +-
.../portability/tests/test-pthread-rwlock-rwr.cc | 2 +-
.../ft-index/portability/tests/test-pwrite4g.cc | 2 +-
.../ft-index/portability/tests/test-snprintf.cc | 2 +-
.../tokudb/ft-index/portability/tests/test-stat.cc | 2 +-
.../ft-index/portability/tests/test-toku-malloc.cc | 2 +-
.../tokudb/ft-index/portability/tests/test-xid.cc | 2 +-
storage/tokudb/ft-index/portability/tests/test.h | 2 +-
.../ft-index/portability/tests/try-assert-zero.cc | 2 +-
.../ft-index/portability/tests/try-assert0.cc | 2 +-
.../ft-index/portability/tests/try-leak-lost.cc | 6 +-
.../portability/tests/try-leak-reachable.cc | 2 +-
.../ft-index/portability/tests/try-uninit.cc | 10 +-
storage/tokudb/ft-index/portability/toku_assert.cc | 2 +-
storage/tokudb/ft-index/portability/toku_assert.h | 9 +-
storage/tokudb/ft-index/portability/toku_atomic.h | 9 +-
.../tokudb/ft-index/portability/toku_byteswap.h | 9 +-
storage/tokudb/ft-index/portability/toku_crash.cc | 2 +-
storage/tokudb/ft-index/portability/toku_crash.h | 9 +-
storage/tokudb/ft-index/portability/toku_htod.h | 13 +-
storage/tokudb/ft-index/portability/toku_htonl.h | 13 +-
storage/tokudb/ft-index/portability/toku_list.h | 14 +-
storage/tokudb/ft-index/portability/toku_os.h | 9 +-
.../tokudb/ft-index/portability/toku_os_types.h | 9 +-
storage/tokudb/ft-index/portability/toku_path.cc | 2 +-
storage/tokudb/ft-index/portability/toku_path.h | 9 +-
.../tokudb/ft-index/portability/toku_portability.h | 45 +-
.../tokudb/ft-index/portability/toku_pthread.cc | 2 +-
storage/tokudb/ft-index/portability/toku_pthread.h | 24 +-
.../tokudb/ft-index/portability/toku_race_tools.h | 54 +-
storage/tokudb/ft-index/portability/toku_random.h | 9 +-
storage/tokudb/ft-index/portability/toku_stdint.h | 10 +-
storage/tokudb/ft-index/portability/toku_stdlib.h | 5 +-
storage/tokudb/ft-index/portability/toku_time.cc | 2 +-
storage/tokudb/ft-index/portability/toku_time.h | 9 +-
.../scripts/run-nightly-coverage-tests.bash | 3 +-
.../ft-index/scripts/run-nightly-drd-tests.bash | 3 +-
.../scripts/run-nightly-release-tests.bash | 5 +-
.../ft-index/scripts/run.db-benchmark-test.bash | 201 -
.../ft-index/scripts/run.fractal.tree.tests.bash | 460 -
.../ft-index/scripts/run.fractal.tree.tests.cmake | 6 -
.../scripts/run.fractal.tree.tests.icc.bash | 2 -
.../scripts/run.fractal.tree.tests.now.bash | 7 -
.../tokudb/ft-index/scripts/run.loader.stress.bash | 164 -
.../tokudb/ft-index/scripts/run.stress-tests.bash | 332 -
.../tokudb/ft-index/scripts/run.stress-tests.py | 5 +-
storage/tokudb/ft-index/scripts/tokucilkscreen | 19 -
storage/tokudb/ft-index/scripts/tokuvalgrind | 52 +
storage/tokudb/ft-index/src/errors.cc | 4 +-
storage/tokudb/ft-index/src/indexer-internal.h | 9 +-
storage/tokudb/ft-index/src/indexer-undo-do.cc | 33 +-
storage/tokudb/ft-index/src/indexer.cc | 48 +-
storage/tokudb/ft-index/src/indexer.h | 9 +-
storage/tokudb/ft-index/src/loader.cc | 10 +-
storage/tokudb/ft-index/src/loader.h | 8 +-
storage/tokudb/ft-index/src/tests/CMakeLists.txt | 8 +-
.../ft-index/src/tests/big-nested-abort-abort.cc | 2 +-
.../ft-index/src/tests/big-nested-abort-commit.cc | 2 +-
.../ft-index/src/tests/big-nested-commit-abort.cc | 2 +-
.../ft-index/src/tests/big-nested-commit-commit.cc | 2 +-
storage/tokudb/ft-index/src/tests/big-shutdown.cc | 189 +
storage/tokudb/ft-index/src/tests/bigtxn27.cc | 2 +-
storage/tokudb/ft-index/src/tests/blackhole.cc | 4 +-
.../ft-index/src/tests/blocking-first-empty.cc | 2 +-
.../tokudb/ft-index/src/tests/blocking-first.cc | 2 +-
storage/tokudb/ft-index/src/tests/blocking-last.cc | 2 +-
.../src/tests/blocking-next-prev-deadlock.cc | 2 +-
.../ft-index/src/tests/blocking-next-prev.cc | 2 +-
.../ft-index/src/tests/blocking-prelock-range.cc | 2 +-
.../ft-index/src/tests/blocking-put-timeout.cc | 2 +-
.../ft-index/src/tests/blocking-put-wakeup.cc | 2 +-
storage/tokudb/ft-index/src/tests/blocking-put.cc | 2 +-
.../ft-index/src/tests/blocking-set-range-0.cc | 2 +-
.../ft-index/src/tests/blocking-set-range-n.cc | 2 +-
.../src/tests/blocking-set-range-reverse-0.cc | 2 +-
storage/tokudb/ft-index/src/tests/blocking-set.cc | 2 +-
.../ft-index/src/tests/blocking-table-lock.cc | 2 +-
storage/tokudb/ft-index/src/tests/bug1381.cc | 2 +-
.../tokudb/ft-index/src/tests/cachetable-race.cc | 2 +-
storage/tokudb/ft-index/src/tests/checkpoint1.cc | 2 +-
.../ft-index/src/tests/checkpoint_fairness.cc | 2 +-
.../tokudb/ft-index/src/tests/checkpoint_stress.cc | 2 +-
.../tokudb/ft-index/src/tests/checkpoint_test.h | 11 +-
.../tokudb/ft-index/src/tests/create-datadir.cc | 2 +-
.../tokudb/ft-index/src/tests/cursor-isolation.cc | 2 +-
.../src/tests/cursor-more-than-a-leaf-provdel.cc | 2 +-
.../ft-index/src/tests/cursor-set-del-rmw.cc | 2 +-
.../ft-index/src/tests/cursor-set-range-rmw.cc | 2 +-
.../ft-index/src/tests/cursor-step-over-delete.cc | 2 +-
.../src/tests/db-put-simple-deadlock-threads.cc | 2 +-
.../ft-index/src/tests/db-put-simple-deadlock.cc | 2 +-
.../ft-index/src/tests/db-put-simple-lockwait.cc | 2 +-
.../ft-index/src/tests/db-put-update-deadlock.cc | 2 +-
.../ft-index/src/tests/dbremove-nofile-limit.cc | 2 +-
.../src/tests/del-multiple-huge-primary-row.cc | 2 +-
.../ft-index/src/tests/del-multiple-srcdb.cc | 2 +-
storage/tokudb/ft-index/src/tests/del-multiple.cc | 2 +-
storage/tokudb/ft-index/src/tests/del-simple.cc | 2 +-
.../tokudb/ft-index/src/tests/directory_lock.cc | 2 +-
storage/tokudb/ft-index/src/tests/diskfull.cc | 2 +-
storage/tokudb/ft-index/src/tests/dump-env.cc | 3 +-
.../tokudb/ft-index/src/tests/env-put-multiple.cc | 2 +-
.../tokudb/ft-index/src/tests/env_loader_memory.cc | 2 +-
storage/tokudb/ft-index/src/tests/env_nproc.cc | 2 +-
storage/tokudb/ft-index/src/tests/env_startup.cc | 2 +-
storage/tokudb/ft-index/src/tests/filesize.cc | 2 +-
.../ft-index/src/tests/get_key_after_bytes_unit.cc | 2 +-
storage/tokudb/ft-index/src/tests/get_last_key.cc | 2 +-
.../ft-index/src/tests/helgrind.suppressions | 22 +-
storage/tokudb/ft-index/src/tests/helgrind1.cc | 2 +-
storage/tokudb/ft-index/src/tests/helgrind2.cc | 2 +-
storage/tokudb/ft-index/src/tests/helgrind3.cc | 2 +-
.../ft-index/src/tests/hot-optimize-table-tests.cc | 8 +-
storage/tokudb/ft-index/src/tests/hotindexer-bw.cc | 3 +-
.../src/tests/hotindexer-error-callback.cc | 2 +-
.../tests/hotindexer-insert-committed-optimized.cc | 2 +-
.../src/tests/hotindexer-insert-committed.cc | 2 +-
.../src/tests/hotindexer-insert-provisional.cc | 2 +-
.../ft-index/src/tests/hotindexer-lock-test.cc | 2 +-
.../ft-index/src/tests/hotindexer-multiclient.cc | 2 +-
.../tests/hotindexer-nested-insert-committed.cc | 2 +-
.../ft-index/src/tests/hotindexer-put-abort.cc | 2 +-
.../ft-index/src/tests/hotindexer-put-commit.cc | 2 +-
.../ft-index/src/tests/hotindexer-put-multiple.cc | 2 +-
.../src/tests/hotindexer-simple-abort-put.cc | 2 +-
.../ft-index/src/tests/hotindexer-simple-abort.cc | 2 +-
.../ft-index/src/tests/hotindexer-undo-do-test.cc | 7 +-
.../ft-index/src/tests/hotindexer-with-queries.cc | 2 +-
storage/tokudb/ft-index/src/tests/inflate.cc | 2 +-
storage/tokudb/ft-index/src/tests/inflate2.cc | 2 +-
.../ft-index/src/tests/insert-dup-prelock.cc | 2 +-
.../ft-index/src/tests/isolation-read-committed.cc | 2 +-
storage/tokudb/ft-index/src/tests/isolation.cc | 2 +-
storage/tokudb/ft-index/src/tests/key-val.h | 11 +-
.../tokudb/ft-index/src/tests/keyrange-merge.cc | 2 +-
storage/tokudb/ft-index/src/tests/keyrange.cc | 2 +-
.../tokudb/ft-index/src/tests/last-verify-time.cc | 2 +-
.../ft-index/src/tests/loader-cleanup-test.cc | 2 +-
.../ft-index/src/tests/loader-close-nproc-limit.cc | 2 +-
.../ft-index/src/tests/loader-create-abort.cc | 2 +-
.../ft-index/src/tests/loader-create-close.cc | 2 +-
.../src/tests/loader-create-commit-nproc-limit.cc | 2 +-
.../src/tests/loader-create-nproc-limit.cc | 2 +-
.../tokudb/ft-index/src/tests/loader-dup-test.cc | 2 +-
.../tokudb/ft-index/src/tests/loader-no-puts.cc | 2 +-
.../ft-index/src/tests/loader-reference-test.cc | 2 +-
.../tokudb/ft-index/src/tests/loader-stress-del.cc | 2 +-
.../ft-index/src/tests/loader-stress-test.cc | 2 +-
.../tokudb/ft-index/src/tests/loader-tpch-load.cc | 2 +-
.../src/tests/locktree_escalation_stalls.cc | 2 +-
storage/tokudb/ft-index/src/tests/manyfiles.cc | 2 +-
.../ft-index/src/tests/maxsize-for-loader.cc | 2 +-
.../src/tests/medium-nested-commit-commit.cc | 2 +-
storage/tokudb/ft-index/src/tests/multiprocess.cc | 2 +-
.../tokudb/ft-index/src/tests/mvcc-create-table.cc | 2 +-
.../ft-index/src/tests/mvcc-many-committed.cc | 2 +-
.../ft-index/src/tests/mvcc-read-committed.cc | 2 +-
.../ft-index/src/tests/openlimit17-locktree.cc | 2 +-
.../ft-index/src/tests/openlimit17-metafiles.cc | 2 +-
storage/tokudb/ft-index/src/tests/openlimit17.cc | 2 +-
.../ft-index/src/tests/perf_checkpoint_var.cc | 2 +-
.../tokudb/ft-index/src/tests/perf_child_txn.cc | 2 +-
.../tokudb/ft-index/src/tests/perf_cursor_nop.cc | 2 +-
storage/tokudb/ft-index/src/tests/perf_iibench.cc | 2 +-
storage/tokudb/ft-index/src/tests/perf_insert.cc | 2 +-
.../tokudb/ft-index/src/tests/perf_malloc_free.cc | 2 +-
storage/tokudb/ft-index/src/tests/perf_nop.cc | 2 +-
storage/tokudb/ft-index/src/tests/perf_ptquery.cc | 2 +-
storage/tokudb/ft-index/src/tests/perf_ptquery2.cc | 2 +-
.../tokudb/ft-index/src/tests/perf_rangequery.cc | 2 +-
storage/tokudb/ft-index/src/tests/perf_read_txn.cc | 2 +-
.../src/tests/perf_read_txn_single_thread.cc | 2 +-
.../tokudb/ft-index/src/tests/perf_read_write.cc | 2 +-
.../ft-index/src/tests/perf_txn_single_thread.cc | 2 +-
storage/tokudb/ft-index/src/tests/powerfail.cc | 2 +-
.../tokudb/ft-index/src/tests/preload-db-nested.cc | 2 +-
storage/tokudb/ft-index/src/tests/preload-db.cc | 2 +-
.../tokudb/ft-index/src/tests/prelock-read-read.cc | 2 +-
.../ft-index/src/tests/prelock-read-write.cc | 2 +-
.../ft-index/src/tests/prelock-write-read.cc | 2 +-
.../ft-index/src/tests/prelock-write-write.cc | 2 +-
.../ft-index/src/tests/print_engine_status.cc | 2 +-
storage/tokudb/ft-index/src/tests/progress.cc | 2 +-
.../src/tests/put-del-multiple-array-indexing.cc | 2 +-
.../ft-index/src/tests/queries_with_deletes.cc | 2 +-
storage/tokudb/ft-index/src/tests/recover-2483.cc | 4 +-
storage/tokudb/ft-index/src/tests/recover-3113.cc | 2 +-
storage/tokudb/ft-index/src/tests/recover-5146.cc | 2 +-
.../recover-checkpoint-fcreate-fdelete-fcreate.cc | 2 +-
.../src/tests/recover-checkpoint-fopen-abort.cc | 2 +-
.../src/tests/recover-checkpoint-fopen-commit.cc | 2 +-
.../ft-index/src/tests/recover-child-rollback.cc | 2 +-
.../src/tests/recover-compare-db-descriptor.cc | 2 +-
.../ft-index/src/tests/recover-compare-db.cc | 2 +-
.../src/tests/recover-del-multiple-abort.cc | 2 +-
.../recover-del-multiple-srcdb-fdelete-all.cc | 2 +-
.../ft-index/src/tests/recover-del-multiple.cc | 2 +-
.../src/tests/recover-delboth-after-checkpoint.cc | 2 +-
.../src/tests/recover-delboth-checkpoint.cc | 2 +-
.../ft-index/src/tests/recover-descriptor.cc | 2 +-
.../ft-index/src/tests/recover-descriptor10.cc | 2 +-
.../ft-index/src/tests/recover-descriptor11.cc | 2 +-
.../ft-index/src/tests/recover-descriptor12.cc | 2 +-
.../ft-index/src/tests/recover-descriptor2.cc | 2 +-
.../ft-index/src/tests/recover-descriptor3.cc | 2 +-
.../ft-index/src/tests/recover-descriptor4.cc | 2 +-
.../ft-index/src/tests/recover-descriptor5.cc | 2 +-
.../ft-index/src/tests/recover-descriptor6.cc | 2 +-
.../ft-index/src/tests/recover-descriptor7.cc | 2 +-
.../ft-index/src/tests/recover-descriptor8.cc | 2 +-
.../ft-index/src/tests/recover-descriptor9.cc | 2 +-
.../ft-index/src/tests/recover-fassociate.cc | 2 +-
.../src/tests/recover-fclose-in-checkpoint.cc | 2 +-
.../src/tests/recover-fcreate-basementnodesize.cc | 2 +-
.../ft-index/src/tests/recover-fcreate-fclose.cc | 2 +-
.../ft-index/src/tests/recover-fcreate-fdelete.cc | 2 +-
.../ft-index/src/tests/recover-fcreate-nodesize.cc | 2 +-
.../ft-index/src/tests/recover-fcreate-xabort.cc | 2 +-
storage/tokudb/ft-index/src/tests/recover-flt1.cc | 2 +-
storage/tokudb/ft-index/src/tests/recover-flt10.cc | 2 +-
storage/tokudb/ft-index/src/tests/recover-flt2.cc | 2 +-
storage/tokudb/ft-index/src/tests/recover-flt3.cc | 2 +-
storage/tokudb/ft-index/src/tests/recover-flt4.cc | 2 +-
storage/tokudb/ft-index/src/tests/recover-flt5.cc | 2 +-
storage/tokudb/ft-index/src/tests/recover-flt6.cc | 2 +-
storage/tokudb/ft-index/src/tests/recover-flt7.cc | 2 +-
storage/tokudb/ft-index/src/tests/recover-flt8.cc | 2 +-
storage/tokudb/ft-index/src/tests/recover-flt9.cc | 2 +-
.../src/tests/recover-fopen-checkpoint-fclose.cc | 2 +-
.../src/tests/recover-fopen-fclose-checkpoint.cc | 2 +-
.../recover-fopen-fdelete-checkpoint-fcreate.cc | 2 +-
.../tests/recover-hotindexer-simple-abort-put.cc | 2 +-
.../ft-index/src/tests/recover-loader-test.cc | 2 +-
.../src/tests/recover-lsn-filter-multiple.cc | 2 +-
.../ft-index/src/tests/recover-lsn-filter.cc | 2 +-
.../ft-index/src/tests/recover-missing-dbfile-2.cc | 2 +-
.../ft-index/src/tests/recover-missing-dbfile.cc | 2 +-
.../ft-index/src/tests/recover-missing-logfile.cc | 2 +-
.../src/tests/recover-put-multiple-abort.cc | 2 +-
.../src/tests/recover-put-multiple-fdelete-all.cc | 2 +-
.../src/tests/recover-put-multiple-fdelete-some.cc | 2 +-
.../recover-put-multiple-srcdb-fdelete-all.cc | 2 +-
.../ft-index/src/tests/recover-put-multiple.cc | 2 +-
.../tokudb/ft-index/src/tests/recover-rollback.cc | 262 +
.../ft-index/src/tests/recover-rollinclude.cc | 274 +
.../ft-index/src/tests/recover-split-checkpoint.cc | 2 +-
.../src/tests/recover-straddle-txn-nested.cc | 2 +-
.../ft-index/src/tests/recover-straddle-txn.cc | 2 +-
.../tokudb/ft-index/src/tests/recover-tablelock.cc | 2 +-
.../src/tests/recover-test-logsuppress-put.cc | 2 +-
.../ft-index/src/tests/recover-test-logsuppress.cc | 2 +-
storage/tokudb/ft-index/src/tests/recover-test1.cc | 2 +-
storage/tokudb/ft-index/src/tests/recover-test2.cc | 3 +-
storage/tokudb/ft-index/src/tests/recover-test3.cc | 3 +-
.../tests/recover-test_crash_in_flusher_thread.h | 5 +-
.../ft-index/src/tests/recover-test_stress1.cc | 2 +-
.../ft-index/src/tests/recover-test_stress2.cc | 2 +-
.../ft-index/src/tests/recover-test_stress3.cc | 2 +-
.../src/tests/recover-test_stress_openclose.cc | 2 +-
.../src/tests/recover-update-multiple-abort.cc | 2 +-
.../ft-index/src/tests/recover-update-multiple.cc | 2 +-
.../ft-index/src/tests/recover-update_aborts.cc | 2 +-
.../recover-update_aborts_before_checkpoint.cc | 2 +-
.../tests/recover-update_aborts_before_close.cc | 2 +-
.../src/tests/recover-update_broadcast_aborts.cc | 2 +-
.../src/tests/recover-update_broadcast_aborts2.cc | 2 +-
.../src/tests/recover-update_broadcast_aborts3.cc | 2 +-
...er-update_broadcast_aborts_before_checkpoint.cc | 2 +-
...recover-update_broadcast_aborts_before_close.cc | 2 +-
.../recover-update_broadcast_changes_values.cc | 2 +-
.../recover-update_broadcast_changes_values2.cc | 2 +-
.../recover-update_broadcast_changes_values3.cc | 2 +-
...e_broadcast_changes_values_before_checkpoint.cc | 2 +-
...update_broadcast_changes_values_before_close.cc | 2 +-
.../src/tests/recover-update_changes_values.cc | 2 +-
...over-update_changes_values_before_checkpoint.cc | 2 +-
.../recover-update_changes_values_before_close.cc | 2 +-
.../recover-upgrade-db-descriptor-multihandle.cc | 2 +-
.../src/tests/recover-upgrade-db-descriptor.cc | 2 +-
.../tokudb/ft-index/src/tests/recover-x1-abort.cc | 2 +-
.../tokudb/ft-index/src/tests/recover-x1-commit.cc | 2 +-
.../ft-index/src/tests/recover-x1-nested-abort.cc | 2 +-
.../ft-index/src/tests/recover-x1-nested-commit.cc | 2 +-
.../tokudb/ft-index/src/tests/recover-x2-abort.cc | 2 +-
.../tokudb/ft-index/src/tests/recover-x2-commit.cc | 2 +-
.../ft-index/src/tests/recovery_fileops_stress.cc | 3 +-
.../ft-index/src/tests/recovery_fileops_unit.cc | 2 +-
.../tokudb/ft-index/src/tests/recovery_stress.cc | 2 +-
storage/tokudb/ft-index/src/tests/redirect.cc | 2 +-
.../ft-index/src/tests/replace-into-write-lock.cc | 2 +-
storage/tokudb/ft-index/src/tests/root_fifo_1.cc | 2 +-
storage/tokudb/ft-index/src/tests/root_fifo_2.cc | 2 +-
storage/tokudb/ft-index/src/tests/root_fifo_31.cc | 2 +-
storage/tokudb/ft-index/src/tests/root_fifo_32.cc | 2 +-
storage/tokudb/ft-index/src/tests/root_fifo_41.cc | 2 +-
storage/tokudb/ft-index/src/tests/rowsize.cc | 2 +-
storage/tokudb/ft-index/src/tests/run_test1426.sh | 19 -
storage/tokudb/ft-index/src/tests/seqinsert.cc | 2 +-
storage/tokudb/ft-index/src/tests/shutdown-3344.cc | 2 +-
storage/tokudb/ft-index/src/tests/simple.cc | 2 +-
.../src/tests/stat64-create-modify-times.cc | 2 +-
.../tokudb/ft-index/src/tests/stat64-null-txn.cc | 2 +-
.../ft-index/src/tests/stat64-root-changes.cc | 2 +-
storage/tokudb/ft-index/src/tests/stat64.cc | 2 +-
storage/tokudb/ft-index/src/tests/stress-gc.cc | 2 +-
storage/tokudb/ft-index/src/tests/stress-gc2.cc | 2 +-
storage/tokudb/ft-index/src/tests/stress-test.cc | 2 +-
.../tokudb/ft-index/src/tests/stress_openclose.h | 4 +-
storage/tokudb/ft-index/src/tests/test-5138.cc | 2 +-
.../ft-index/src/tests/test-nested-xopen-eclose.cc | 2 +-
storage/tokudb/ft-index/src/tests/test-prepare.cc | 2 +-
storage/tokudb/ft-index/src/tests/test-prepare2.cc | 2 +-
storage/tokudb/ft-index/src/tests/test-prepare3.cc | 2 +-
.../tokudb/ft-index/src/tests/test-rollinclude.cc | 2 +-
.../tokudb/ft-index/src/tests/test-xa-prepare.cc | 2 +-
.../tokudb/ft-index/src/tests/test-xopen-eclose.cc | 2 +-
storage/tokudb/ft-index/src/tests/test.h | 22 +-
storage/tokudb/ft-index/src/tests/test1572.cc | 4 +-
storage/tokudb/ft-index/src/tests/test1753.cc | 2 +-
storage/tokudb/ft-index/src/tests/test1842.cc | 2 +-
storage/tokudb/ft-index/src/tests/test3039.cc | 2 +-
storage/tokudb/ft-index/src/tests/test3219.cc | 2 +-
storage/tokudb/ft-index/src/tests/test3522.cc | 2 +-
storage/tokudb/ft-index/src/tests/test3522b.cc | 2 +-
storage/tokudb/ft-index/src/tests/test3529.cc | 2 +-
.../tokudb/ft-index/src/tests/test4573-logtrim.cc | 2 +-
storage/tokudb/ft-index/src/tests/test5092.cc | 2 +-
storage/tokudb/ft-index/src/tests/test938.cc | 2 +-
storage/tokudb/ft-index/src/tests/test938b.cc | 2 +-
storage/tokudb/ft-index/src/tests/test938c.cc | 4 +-
.../ft-index/src/tests/test_3529_insert_2.cc | 2 +-
.../ft-index/src/tests/test_3529_table_lock.cc | 2 +-
storage/tokudb/ft-index/src/tests/test_3645.cc | 2 +-
storage/tokudb/ft-index/src/tests/test_3755.cc | 2 +-
storage/tokudb/ft-index/src/tests/test_4015.cc | 2 +-
storage/tokudb/ft-index/src/tests/test_4368.cc | 2 +-
storage/tokudb/ft-index/src/tests/test_4657.cc | 2 +-
storage/tokudb/ft-index/src/tests/test_5015.cc | 2 +-
storage/tokudb/ft-index/src/tests/test_5469.cc | 2 +-
storage/tokudb/ft-index/src/tests/test_789.cc | 2 +-
storage/tokudb/ft-index/src/tests/test_935.cc | 2 +-
storage/tokudb/ft-index/src/tests/test_abort1.cc | 4 +-
storage/tokudb/ft-index/src/tests/test_abort2.cc | 2 +-
storage/tokudb/ft-index/src/tests/test_abort3.cc | 2 +-
storage/tokudb/ft-index/src/tests/test_abort4.cc | 2 +-
storage/tokudb/ft-index/src/tests/test_abort5.cc | 2 +-
.../ft-index/src/tests/test_abort_delete_first.cc | 2 +-
storage/tokudb/ft-index/src/tests/test_archive0.cc | 2 +-
storage/tokudb/ft-index/src/tests/test_archive1.cc | 2 +-
storage/tokudb/ft-index/src/tests/test_archive2.cc | 2 +-
.../src/tests/test_bad_implicit_promotion.cc | 2 +-
.../ft-index/src/tests/test_blobs_leaf_split.cc | 2 +-
.../tokudb/ft-index/src/tests/test_bulk_fetch.cc | 2 +-
.../tokudb/ft-index/src/tests/test_cachesize.cc | 2 +-
.../ft-index/src/tests/test_cmp_descriptor.cc | 2 +-
.../ft-index/src/tests/test_compression_methods.cc | 2 +-
storage/tokudb/ft-index/src/tests/test_cursor_2.cc | 2 +-
storage/tokudb/ft-index/src/tests/test_cursor_3.cc | 2 +-
.../src/tests/test_cursor_DB_NEXT_no_dup.cc | 2 +-
.../ft-index/src/tests/test_cursor_db_current.cc | 2 +-
.../ft-index/src/tests/test_cursor_delete2.cc | 2 +-
.../tokudb/ft-index/src/tests/test_cursor_flags.cc | 2 +-
.../ft-index/src/tests/test_cursor_interrupt.cc | 2 +-
.../src/tests/test_cursor_nonleaf_expand.cc | 2 +-
.../tokudb/ft-index/src/tests/test_cursor_null.cc | 2 +-
.../ft-index/src/tests/test_cursor_stickyness.cc | 2 +-
.../src/tests/test_cursor_with_read_txn.cc | 2 +-
.../ft-index/src/tests/test_db_already_exists.cc | 2 +-
.../ft-index/src/tests/test_db_change_pagesize.cc | 2 +-
.../ft-index/src/tests/test_db_change_xxx.cc | 2 +-
.../ft-index/src/tests/test_db_close_no_open.cc | 2 +-
.../src/tests/test_db_current_clobbers_db.cc | 2 +-
.../ft-index/src/tests/test_db_dbt_mem_behavior.cc | 2 +-
.../tokudb/ft-index/src/tests/test_db_delete.cc | 2 +-
.../ft-index/src/tests/test_db_descriptor.cc | 2 +-
.../ft-index/src/tests/test_db_env_open_close.cc | 2 +-
.../src/tests/test_db_env_open_nocreate.cc | 4 +-
.../src/tests/test_db_env_open_open_close.cc | 2 +-
.../ft-index/src/tests/test_db_env_set_errpfx.cc | 2 +-
.../ft-index/src/tests/test_db_env_set_lg_dir.cc | 2 +-
.../ft-index/src/tests/test_db_env_set_tmp_dir.cc | 2 +-
.../ft-index/src/tests/test_db_env_strdup_null.cc | 2 +-
.../ft-index/src/tests/test_db_get_put_flags.cc | 2 +-
.../src/tests/test_db_named_delete_last.cc | 2 +-
.../tokudb/ft-index/src/tests/test_db_no_env.cc | 2 +-
.../src/tests/test_db_open_notexist_reopen.cc | 4 +-
.../tokudb/ft-index/src/tests/test_db_remove.cc | 2 +-
.../ft-index/src/tests/test_db_remove_subdb.cc | 2 +-
.../tokudb/ft-index/src/tests/test_db_set_flags.cc | 2 +-
storage/tokudb/ft-index/src/tests/test_db_subdb.cc | 2 +-
.../src/tests/test_db_subdb_different_flags.cc | 2 +-
.../src/tests/test_db_txn_locks_nonheaviside.cc | 2 +-
.../tests/test_db_txn_locks_read_uncommitted.cc | 2 +-
.../tokudb/ft-index/src/tests/test_db_version.cc | 2 +-
.../ft-index/src/tests/test_env_close_flags.cc | 2 +-
.../src/tests/test_env_create_db_create.cc | 2 +-
.../ft-index/src/tests/test_env_open_flags.cc | 2 +-
.../tests/test_equal_keys_with_different_bytes.cc | 2 +-
storage/tokudb/ft-index/src/tests/test_error.cc | 2 +-
storage/tokudb/ft-index/src/tests/test_forkjoin.cc | 2 +-
.../ft-index/src/tests/test_get_max_row_size.cc | 2 +-
.../ft-index/src/tests/test_get_zeroed_dbt.cc | 2 +-
.../ft-index/src/tests/test_groupcommit_count.cc | 2 +-
.../ft-index/src/tests/test_groupcommit_perf.cc | 2 +-
storage/tokudb/ft-index/src/tests/test_hsoc.cc | 2 +-
.../src/tests/test_insert_cursor_delete_insert.cc | 2 +-
.../ft-index/src/tests/test_insert_many_gc.cc | 2 +-
.../ft-index/src/tests/test_insert_memleak.cc | 2 +-
.../ft-index/src/tests/test_insert_unique.cc | 17 +-
.../src/tests/test_iterate_live_transactions.cc | 2 +-
.../tests/test_iterate_pending_lock_requests.cc | 2 +-
.../tokudb/ft-index/src/tests/test_keylen_diff.cc | 282 +
storage/tokudb/ft-index/src/tests/test_kv_gen.h | 11 +-
.../tokudb/ft-index/src/tests/test_kv_limits.cc | 2 +-
...test_large_update_broadcast_small_cachetable.cc | 2 +-
.../src/tests/test_lock_timeout_callback.cc | 2 +-
.../src/tests/test_locking_with_read_txn.cc | 2 +-
.../ft-index/src/tests/test_locktree_close.cc | 2 +-
storage/tokudb/ft-index/src/tests/test_log0.cc | 4 +-
storage/tokudb/ft-index/src/tests/test_log1.cc | 4 +-
storage/tokudb/ft-index/src/tests/test_log10.cc | 4 +-
.../tokudb/ft-index/src/tests/test_log1_abort.cc | 2 +-
storage/tokudb/ft-index/src/tests/test_log2.cc | 4 +-
.../tokudb/ft-index/src/tests/test_log2_abort.cc | 4 +-
storage/tokudb/ft-index/src/tests/test_log3.cc | 4 +-
.../tokudb/ft-index/src/tests/test_log3_abort.cc | 2 +-
storage/tokudb/ft-index/src/tests/test_log4.cc | 4 +-
.../tokudb/ft-index/src/tests/test_log4_abort.cc | 2 +-
storage/tokudb/ft-index/src/tests/test_log5.cc | 4 +-
.../tokudb/ft-index/src/tests/test_log5_abort.cc | 2 +-
storage/tokudb/ft-index/src/tests/test_log6.cc | 4 +-
.../tokudb/ft-index/src/tests/test_log6_abort.cc | 2 +-
.../tokudb/ft-index/src/tests/test_log6a_abort.cc | 2 +-
storage/tokudb/ft-index/src/tests/test_log7.cc | 4 +-
storage/tokudb/ft-index/src/tests/test_log8.cc | 4 +-
storage/tokudb/ft-index/src/tests/test_log9.cc | 4 +-
storage/tokudb/ft-index/src/tests/test_logflush.cc | 2 +-
storage/tokudb/ft-index/src/tests/test_logmax.cc | 2 +-
.../tokudb/ft-index/src/tests/test_memcmp_magic.cc | 219 +
.../tokudb/ft-index/src/tests/test_mostly_seq.cc | 2 +-
.../test_multiple_checkpoints_block_commit.cc | 2 +-
storage/tokudb/ft-index/src/tests/test_nested.cc | 2 +-
.../tokudb/ft-index/src/tests/test_nodup_set.cc | 2 +-
storage/tokudb/ft-index/src/tests/test_query.cc | 2 +-
.../tokudb/ft-index/src/tests/test_rand_insert.cc | 2 +-
.../src/tests/test_read_txn_invalid_ops.cc | 2 +-
.../ft-index/src/tests/test_redirect_func.cc | 2 +-
storage/tokudb/ft-index/src/tests/test_restrict.cc | 2 +-
.../ft-index/src/tests/test_reverse_compare_fun.cc | 2 +-
.../ft-index/src/tests/test_set_func_malloc.cc | 2 +-
.../ft-index/src/tests/test_simple_read_txn.cc | 2 +-
storage/tokudb/ft-index/src/tests/test_stress0.cc | 2 +-
storage/tokudb/ft-index/src/tests/test_stress1.cc | 2 +-
storage/tokudb/ft-index/src/tests/test_stress2.cc | 2 +-
storage/tokudb/ft-index/src/tests/test_stress3.cc | 2 +-
storage/tokudb/ft-index/src/tests/test_stress4.cc | 2 +-
storage/tokudb/ft-index/src/tests/test_stress5.cc | 2 +-
storage/tokudb/ft-index/src/tests/test_stress6.cc | 2 +-
storage/tokudb/ft-index/src/tests/test_stress7.cc | 12 +-
.../ft-index/src/tests/test_stress_hot_indexing.cc | 2 +-
.../ft-index/src/tests/test_stress_openclose.cc | 2 +-
.../ft-index/src/tests/test_stress_with_verify.cc | 2 +-
.../tokudb/ft-index/src/tests/test_thread_flags.cc | 2 +-
.../ft-index/src/tests/test_thread_insert.cc | 2 +-
.../src/tests/test_trans_desc_during_chkpt.cc | 2 +-
.../src/tests/test_trans_desc_during_chkpt2.cc | 2 +-
.../src/tests/test_trans_desc_during_chkpt3.cc | 2 +-
.../src/tests/test_trans_desc_during_chkpt4.cc | 2 +-
.../src/tests/test_transactional_descriptor.cc | 2 +-
.../tokudb/ft-index/src/tests/test_txn_abort5.cc | 2 +-
.../tokudb/ft-index/src/tests/test_txn_abort5a.cc | 2 +-
.../tokudb/ft-index/src/tests/test_txn_abort6.cc | 2 +-
.../tokudb/ft-index/src/tests/test_txn_abort7.cc | 2 +-
.../ft-index/src/tests/test_txn_begin_commit.cc | 2 +-
.../src/tests/test_txn_close_before_commit.cc | 2 +-
.../tests/test_txn_close_before_prepare_commit.cc | 2 +-
.../ft-index/src/tests/test_txn_cursor_last.cc | 2 +-
.../tokudb/ft-index/src/tests/test_txn_nested1.cc | 4 +-
.../tokudb/ft-index/src/tests/test_txn_nested2.cc | 13 +-
.../tokudb/ft-index/src/tests/test_txn_nested3.cc | 4 +-
.../tokudb/ft-index/src/tests/test_txn_nested4.cc | 4 +-
.../tokudb/ft-index/src/tests/test_txn_nested5.cc | 4 +-
.../ft-index/src/tests/test_txn_nested_abort.cc | 2 +-
.../ft-index/src/tests/test_txn_nested_abort2.cc | 2 +-
.../ft-index/src/tests/test_txn_nested_abort3.cc | 2 +-
.../ft-index/src/tests/test_txn_nested_abort4.cc | 2 +-
.../tokudb/ft-index/src/tests/test_txn_recover3.cc | 2 +-
.../ft-index/src/tests/test_unused_memory_crash.cc | 2 +-
.../ft-index/src/tests/test_update_abort_works.cc | 2 +-
.../src/tests/test_update_broadcast_abort_works.cc | 2 +-
.../src/tests/test_update_broadcast_calls_back.cc | 2 +-
.../test_update_broadcast_can_delete_elements.cc | 2 +-
.../tests/test_update_broadcast_changes_values.cc | 2 +-
.../src/tests/test_update_broadcast_indexer.cc | 2 +-
.../src/tests/test_update_broadcast_loader.cc | 2 +-
.../tests/test_update_broadcast_nested_updates.cc | 2 +-
.../test_update_broadcast_previously_deleted.cc | 2 +-
.../src/tests/test_update_broadcast_stress.cc | 2 +-
...test_update_broadcast_update_fun_has_choices.cc | 2 +-
.../test_update_broadcast_with_empty_table.cc | 2 +-
.../ft-index/src/tests/test_update_calls_back.cc | 2 +-
.../src/tests/test_update_can_delete_elements.cc | 2 +-
.../src/tests/test_update_changes_values.cc | 2 +-
.../src/tests/test_update_nested_updates.cc | 2 +-
.../src/tests/test_update_nonexistent_keys.cc | 2 +-
.../src/tests/test_update_previously_deleted.cc | 2 +-
.../ft-index/src/tests/test_update_stress.cc | 2 +-
.../test_update_txn_snapshot_works_concurrently.cc | 2 +-
...te_txn_snapshot_works_correctly_with_deletes.cc | 2 +-
.../src/tests/test_update_with_empty_table.cc | 2 +-
.../ft-index/src/tests/test_updates_single_key.cc | 2 +-
.../tokudb/ft-index/src/tests/test_weakxaction.cc | 2 +-
.../ft-index/src/tests/test_zero_length_keys.cc | 2 +-
.../src/tests/threaded_stress_test_helpers.h | 39 +-
.../tokudb/ft-index/src/tests/time_create_db.cc | 2 +-
.../ft-index/src/tests/transactional_fileops.cc | 2 +-
.../src/tests/update-multiple-data-diagonal.cc | 2 +-
.../ft-index/src/tests/update-multiple-key0.cc | 2 +-
.../ft-index/src/tests/update-multiple-nochange.cc | 2 +-
.../tests/update-multiple-with-indexer-array.cc | 2 +-
.../src/tests/update-multiple-with-indexer.cc | 2 +-
storage/tokudb/ft-index/src/tests/update.cc | 2 +-
.../tokudb/ft-index/src/tests/upgrade-test-1.cc | 4 +-
.../tokudb/ft-index/src/tests/upgrade-test-2.cc | 4 +-
.../tokudb/ft-index/src/tests/upgrade-test-3.cc | 6 +-
.../tokudb/ft-index/src/tests/upgrade-test-4.cc | 4 +-
.../tokudb/ft-index/src/tests/upgrade-test-5.cc | 4 +-
.../tokudb/ft-index/src/tests/upgrade-test-6.cc | 2 +-
.../tokudb/ft-index/src/tests/upgrade-test-7.cc | 6 +-
.../tokudb/ft-index/src/tests/upgrade_simple.cc | 2 +-
.../tokudb/ft-index/src/tests/xa-dirty-commit.cc | 193 +
.../tokudb/ft-index/src/tests/xa-dirty-rollback.cc | 193 +
.../ft-index/src/tests/xa-txn-discard-abort.cc | 195 +
.../ft-index/src/tests/xa-txn-discard-commit.cc | 196 +
storage/tokudb/ft-index/src/tests/zombie_db.cc | 2 +-
storage/tokudb/ft-index/src/toku_patent.cc | 4 +-
storage/tokudb/ft-index/src/ydb-internal.h | 40 +-
storage/tokudb/ft-index/src/ydb.cc | 182 +-
storage/tokudb/ft-index/src/ydb.h | 9 +-
storage/tokudb/ft-index/src/ydb_cursor.cc | 159 +-
storage/tokudb/ft-index/src/ydb_cursor.h | 17 +-
storage/tokudb/ft-index/src/ydb_db.cc | 117 +-
storage/tokudb/ft-index/src/ydb_db.h | 13 +-
storage/tokudb/ft-index/src/ydb_env_func.cc | 10 +-
storage/tokudb/ft-index/src/ydb_env_func.h | 10 +-
storage/tokudb/ft-index/src/ydb_lib.cc | 8 +-
storage/tokudb/ft-index/src/ydb_load.h | 8 +-
storage/tokudb/ft-index/src/ydb_row_lock.cc | 21 +-
storage/tokudb/ft-index/src/ydb_row_lock.h | 7 +-
storage/tokudb/ft-index/src/ydb_txn.cc | 59 +-
storage/tokudb/ft-index/src/ydb_txn.h | 10 +-
storage/tokudb/ft-index/src/ydb_write.cc | 12 +-
storage/tokudb/ft-index/src/ydb_write.h | 13 +-
storage/tokudb/ft-index/tools/CMakeLists.txt | 27 +-
storage/tokudb/ft-index/tools/ba_replay.cc | 679 +
storage/tokudb/ft-index/tools/ftverify.cc | 507 +
storage/tokudb/ft-index/tools/parseTraceFiles.py | 82 -
storage/tokudb/ft-index/tools/tdb-recover.cc | 133 +
storage/tokudb/ft-index/tools/tdb_logprint.cc | 128 +
storage/tokudb/ft-index/tools/tokudb_common.h | 109 -
.../tokudb/ft-index/tools/tokudb_common_funcs.h | 337 -
storage/tokudb/ft-index/tools/tokudb_dump.cc | 252 +-
storage/tokudb/ft-index/tools/tokudb_gen.cc | 471 -
storage/tokudb/ft-index/tools/tokudb_load.cc | 977 -
storage/tokudb/ft-index/tools/tokuftdump.cc | 726 +
storage/tokudb/ft-index/util/CMakeLists.txt | 3 +
storage/tokudb/ft-index/util/bytestring.h | 96 +
storage/tokudb/ft-index/util/circular_buffer.cc | 2 +-
storage/tokudb/ft-index/util/circular_buffer.h | 9 +-
storage/tokudb/ft-index/util/constexpr.h | 6 +-
storage/tokudb/ft-index/util/context.cc | 4 +-
storage/tokudb/ft-index/util/context.h | 2 +-
storage/tokudb/ft-index/util/dbt.cc | 343 +
storage/tokudb/ft-index/util/dbt.h | 141 +
storage/tokudb/ft-index/util/dmt.cc | 16 +-
storage/tokudb/ft-index/util/dmt.h | 20 +-
storage/tokudb/ft-index/util/doubly_linked_list.h | 8 +-
storage/tokudb/ft-index/util/fmutex.h | 5 +-
storage/tokudb/ft-index/util/frwlock.cc | 2 +-
storage/tokudb/ft-index/util/frwlock.h | 8 +-
storage/tokudb/ft-index/util/growable_array.h | 8 +-
storage/tokudb/ft-index/util/kibbutz.cc | 2 +-
storage/tokudb/ft-index/util/kibbutz.h | 9 +-
storage/tokudb/ft-index/util/memarena.cc | 229 +-
storage/tokudb/ft-index/util/memarena.h | 128 +-
storage/tokudb/ft-index/util/mempool.cc | 19 +-
storage/tokudb/ft-index/util/mempool.h | 15 +-
storage/tokudb/ft-index/util/minicron.cc | 247 +
storage/tokudb/ft-index/util/minicron.h | 126 +
storage/tokudb/ft-index/util/nb_mutex.h | 8 +-
storage/tokudb/ft-index/util/omt.cc | 2 +-
storage/tokudb/ft-index/util/omt.h | 8 +-
.../tokudb/ft-index/util/partitioned_counter.cc | 2 +-
storage/tokudb/ft-index/util/partitioned_counter.h | 9 +-
storage/tokudb/ft-index/util/queue.cc | 232 +
storage/tokudb/ft-index/util/queue.h | 137 +
storage/tokudb/ft-index/util/rwlock.h | 9 +-
storage/tokudb/ft-index/util/scoped_malloc.cc | 2 +-
storage/tokudb/ft-index/util/scoped_malloc.h | 2 +-
storage/tokudb/ft-index/util/sort.h | 23 +-
storage/tokudb/ft-index/util/status.h | 7 +-
.../tokudb/ft-index/util/tests/marked-omt-test.cc | 2 +-
.../tokudb/ft-index/util/tests/memarena-test.cc | 234 +
.../tokudb/ft-index/util/tests/minicron-test.cc | 272 +
storage/tokudb/ft-index/util/tests/omt-test.cc | 2 +-
.../tokudb/ft-index/util/tests/omt-tmpl-test.cc | 2 +-
storage/tokudb/ft-index/util/tests/queue-test.cc | 185 +
.../tokudb/ft-index/util/tests/rwlock_condvar.h | 2 +-
.../tokudb/ft-index/util/tests/sort-tmpl-test.cc | 2 +-
storage/tokudb/ft-index/util/tests/test-kibbutz.cc | 2 +-
.../tokudb/ft-index/util/tests/test-kibbutz2.cc | 2 +-
.../ft-index/util/tests/test-rwlock-cheapness.cc | 2 +-
storage/tokudb/ft-index/util/tests/test-rwlock.cc | 2 +-
storage/tokudb/ft-index/util/tests/test.h | 2 +-
.../ft-index/util/tests/test_circular_buffer.cc | 2 +-
.../ft-index/util/tests/test_doubly_linked_list.cc | 2 +-
.../util/tests/test_partitioned_counter.cc | 5 +-
.../util/tests/test_partitioned_counter_5833.cc | 2 +-
.../ft-index/util/tests/threadpool-nproc-limit.cc | 2 +-
.../tokudb/ft-index/util/tests/threadpool-test.cc | 2 +-
.../ft-index/util/tests/threadpool-testrunf.cc | 2 +-
storage/tokudb/ft-index/util/tests/x1764-test.cc | 2 +-
storage/tokudb/ft-index/util/threadpool.cc | 2 +-
storage/tokudb/ft-index/util/threadpool.h | 7 +-
storage/tokudb/ft-index/util/x1764.cc | 2 +-
storage/tokudb/ft-index/util/x1764.h | 9 +-
storage/tokudb/ha_tokudb.cc | 506 +-
storage/tokudb/ha_tokudb.h | 21 +-
storage/tokudb/ha_tokudb_admin.cc | 8 +-
storage/tokudb/ha_tokudb_alter_56.cc | 55 +-
storage/tokudb/hatoku_defines.h | 9 +-
storage/tokudb/hatoku_hton.cc | 448 +-
storage/tokudb/hatoku_hton.h | 38 +-
storage/tokudb/mysql-test/rpl/disabled.def | 12 +
.../tokudb/mysql-test/rpl/include/have_tokudb.opt | 2 +-
.../mysql-test/rpl/r/rpl_tokudb_delete_pk.result | 17 +
.../rpl/r/rpl_tokudb_delete_pk_lookup1.result | 17 +
.../rpl/r/rpl_tokudb_update_pk_uc0_lookup0.result | 27 +
.../rpl/r/rpl_tokudb_update_pk_uc0_lookup1.result | 27 +
.../rpl/r/rpl_tokudb_update_pk_uc1_lookup0.result | 27 +
.../rpl/r/rpl_tokudb_update_pk_uc1_lookup1.result | 27 +
.../r/rpl_tokudb_update_unique_uc0_lookup0.result | 27 +
.../r/rpl_tokudb_update_unique_uc0_lookup1.result | 27 +
.../mysql-test/rpl/r/rpl_tokudb_write_pk.result | 14 +
.../rpl/r/rpl_tokudb_write_pk_uc1.result | 14 +
.../rpl/r/rpl_tokudb_write_unique.result | 14 +
.../rpl/r/rpl_tokudb_write_unique_uc1.result | 14 +
.../rpl/t/rpl_tokudb_delete_pk-slave.opt | 1 +
.../mysql-test/rpl/t/rpl_tokudb_delete_pk.test | 63 +
.../rpl/t/rpl_tokudb_delete_pk_lookup1-slave.opt | 1 +
.../rpl/t/rpl_tokudb_delete_pk_lookup1.test | 66 +
.../t/rpl_tokudb_update_pk_uc0_lookup0-slave.opt | 1 +
.../rpl/t/rpl_tokudb_update_pk_uc0_lookup0.test | 70 +
.../t/rpl_tokudb_update_pk_uc0_lookup1-slave.opt | 1 +
.../rpl/t/rpl_tokudb_update_pk_uc0_lookup1.test | 70 +
.../t/rpl_tokudb_update_pk_uc1_lookup0-slave.opt | 1 +
.../rpl/t/rpl_tokudb_update_pk_uc1_lookup0.test | 70 +
.../t/rpl_tokudb_update_pk_uc1_lookup1-slave.opt | 1 +
.../rpl/t/rpl_tokudb_update_pk_uc1_lookup1.test | 70 +
.../rpl_tokudb_update_unique_uc0_lookup0-slave.opt | 1 +
.../t/rpl_tokudb_update_unique_uc0_lookup0.test | 70 +
.../rpl_tokudb_update_unique_uc0_lookup1-slave.opt | 1 +
.../t/rpl_tokudb_update_unique_uc0_lookup1.test | 69 +
.../mysql-test/rpl/t/rpl_tokudb_write_pk-slave.opt | 1 +
.../mysql-test/rpl/t/rpl_tokudb_write_pk.test | 53 +
.../rpl/t/rpl_tokudb_write_pk_uc1-slave.opt | 1 +
.../mysql-test/rpl/t/rpl_tokudb_write_pk_uc1.test | 53 +
.../rpl/t/rpl_tokudb_write_unique-slave.opt | 1 +
.../mysql-test/rpl/t/rpl_tokudb_write_unique.test | 52 +
.../rpl/t/rpl_tokudb_write_unique_uc1-slave.opt | 1 +
.../rpl/t/rpl_tokudb_write_unique_uc1.test | 52 +
.../mysql-test/rpl/t/tokudb_innodb_xa_crash.test | 2 +-
storage/tokudb/mysql-test/tokudb/disabled.def | 3 +
.../mysql-test/tokudb/include/have_tokudb.inc | 1 +
.../mysql-test/tokudb/r/bf_create_select.result | 198 +
.../tokudb/r/bf_create_select_hash_part.result | 198 +
.../tokudb/r/bf_create_select_range_part.result | 206 +
.../tokudb/r/bf_create_temp_select.result | 198 +
.../tokudb/mysql-test/tokudb/r/bf_delete.result | 54 +
.../mysql-test/tokudb/r/bf_delete_trigger.result | 54 +
.../mysql-test/tokudb/r/bf_insert_select.result | 121 +
.../tokudb/r/bf_insert_select_dup_key.result | 123 +
.../tokudb/r/bf_insert_select_trigger.result | 45 +
.../r/bf_insert_select_update_trigger.result | 121 +
.../mysql-test/tokudb/r/bf_replace_select.result | 121 +
.../tokudb/r/bf_replace_select_trigger.result | 121 +
.../mysql-test/tokudb/r/bf_select_hash_part.result | 278 +
.../tokudb/r/bf_select_range_part.result | 406 +
.../mysql-test/tokudb/r/card_drop_index_2.result | 158 +
.../mysql-test/tokudb/r/cluster_key_part.result | 28 +
.../mysql-test/tokudb/r/ext_key_1_innodb.result | 107 -
.../mysql-test/tokudb/r/ext_key_1_tokudb.result | 107 -
.../mysql-test/tokudb/r/ext_key_2_innodb.result | 42 -
.../mysql-test/tokudb/r/ext_key_2_tokudb.result | 42 -
.../tokudb/r/i_s_tokudb_lock_waits_released.result | 41 +-
.../tokudb/r/i_s_tokudb_lock_waits_timeout.result | 20 +-
.../mysql-test/tokudb/r/i_s_tokudb_locks.result | 18 +-
.../tokudb/r/i_s_tokudb_locks_released.result | 13 +-
.../r/information-schema-global-status.result | 1 +
.../mysql-test/tokudb/r/tokudb_support_xa.result | 126 +
storage/tokudb/mysql-test/tokudb/suite.opt | 2 +-
.../mysql-test/tokudb/t/bf_create_select.test | 103 +
.../tokudb/t/bf_create_select_hash_part.test | 102 +
.../tokudb/t/bf_create_select_range_part.test | 109 +
.../mysql-test/tokudb/t/bf_create_temp_select.test | 103 +
storage/tokudb/mysql-test/tokudb/t/bf_delete.test | 71 +
.../mysql-test/tokudb/t/bf_delete_trigger.test | 70 +
.../mysql-test/tokudb/t/bf_insert_select.test | 100 +
.../tokudb/t/bf_insert_select_dup_key.test | 105 +
.../tokudb/t/bf_insert_select_trigger.test | 65 +
.../tokudb/t/bf_insert_select_update_trigger.test | 170 +
.../mysql-test/tokudb/t/bf_replace_select.test | 100 +
.../tokudb/t/bf_replace_select_trigger.test | 169 +
.../mysql-test/tokudb/t/bf_select_hash_part.test | 102 +
.../mysql-test/tokudb/t/bf_select_range_part.test | 103 +
.../mysql-test/tokudb/t/card_drop_index_2.test | 35 +
.../mysql-test/tokudb/t/cluster_key_part.test | 23 +
.../mysql-test/tokudb/t/ext_key_1_innodb.test | 44 -
.../mysql-test/tokudb/t/ext_key_1_tokudb.test | 44 -
.../mysql-test/tokudb/t/ext_key_2_innodb.test | 24 -
.../mysql-test/tokudb/t/ext_key_2_tokudb.test | 24 -
.../tokudb/t/fast_update_binlog_mixed.test | 2 +-
.../tokudb/t/fast_update_binlog_statement.test | 2 +-
.../tokudb/t/hotindex-insert-bigchar.opt | 1 -
.../tokudb/t/i_s_tokudb_lock_waits_released.test | 10 +-
.../tokudb/t/i_s_tokudb_lock_waits_timeout.test | 2 +
.../mysql-test/tokudb/t/i_s_tokudb_locks.test | 3 +-
.../tokudb/t/i_s_tokudb_locks_released.test | 6 +-
.../mysql-test/tokudb/t/tokudb_support_xa.test | 133 +
.../tokudb/mysql-test/tokudb_add_index/suite.opt | 2 +-
.../r/fractional_time_alter_table.result | 174 -
.../tokudb/mysql-test/tokudb_alter_table/suite.opt | 2 +-
.../t/fractional_time_alter_table.test | 164 -
.../tokudb/mysql-test/tokudb_bugs/r/4676.result | 13 -
.../tokudb/mysql-test/tokudb_bugs/r/4677.result | 11 -
.../tokudb_bugs/r/db397_delete_trigger.result | 57 +
.../tokudb_bugs/r/db397_insert_trigger.result | 56 +
.../tokudb_bugs/r/db397_update_trigger.result | 58 +
.../mysql-test/tokudb_bugs/r/db739_insert.result | 100013 +++++++++++++++++
.../mysql-test/tokudb_bugs/r/db739_replace.result | 100014 ++++++++++++++++++
.../mysql-test/tokudb_bugs/r/db739_upsert.result | 100013 +++++++++++++++++
.../tokudb/mysql-test/tokudb_bugs/r/db743.result | 13 +
.../tokudb_bugs/r/db756_card_part_hash.result | 21 +
.../tokudb_bugs/r/db756_card_part_hash_1.result | 20 +
.../r/db756_card_part_hash_1_pick.result | 21 +
.../tokudb_bugs/r/db756_card_part_hash_2.result | 20 +
.../r/db756_card_part_hash_2_pick.result | 21 +
.../tokudb_bugs/r/db757_part_alter_analyze.result | 50 +
.../tokudb_bugs/r/fractional_time.result | 62 -
.../mysql-test/tokudb_bugs/r/mdev5932.result | 1 +
.../mysql-test/tokudb_bugs/r/simple_icp.result | 178 -
.../mysql-test/tokudb_bugs/r/tokudb718.result | 9 +
.../mysql-test/tokudb_bugs/r/tokudb_mrr.result | 851 -
.../mysql-test/tokudb_bugs/r/tokudb_mrr2.result | 441 -
storage/tokudb/mysql-test/tokudb_bugs/suite.opt | 2 +-
storage/tokudb/mysql-test/tokudb_bugs/t/4676.test | 15 -
storage/tokudb/mysql-test/tokudb_bugs/t/4677.test | 30 -
storage/tokudb/mysql-test/tokudb_bugs/t/5585.test | 1 +
.../tokudb_bugs/t/db397_delete_trigger.test | 50 +
.../tokudb_bugs/t/db397_insert_trigger.test | 48 +
.../tokudb_bugs/t/db397_update_trigger.test | 52 +
.../mysql-test/tokudb_bugs/t/db739_insert.test | 28 +
.../mysql-test/tokudb_bugs/t/db739_replace.test | 29 +
.../mysql-test/tokudb_bugs/t/db739_upsert.test | 28 +
storage/tokudb/mysql-test/tokudb_bugs/t/db743.test | 23 +
.../tokudb_bugs/t/db756_card_part_hash.test | 15 +
.../tokudb_bugs/t/db756_card_part_hash_1.test | 14 +
.../tokudb_bugs/t/db756_card_part_hash_1_pick.test | 15 +
.../tokudb_bugs/t/db756_card_part_hash_2.test | 14 +
.../tokudb_bugs/t/db756_card_part_hash_2_pick.test | 15 +
.../tokudb_bugs/t/db757_part_alter_analyze.test | 26 +
.../mysql-test/tokudb_bugs/t/fractional_time.test | 36 -
.../tokudb/mysql-test/tokudb_bugs/t/mdev5932.test | 1 +
.../tokudb_bugs/t/rpl_mixed_replace_into.test | 2 +-
.../tokudb_bugs/t/rpl_row_replace_into.test | 2 +-
.../tokudb_bugs/t/rpl_stmt_replace_into.test | 2 +-
.../mysql-test/tokudb_bugs/t/simple_icp.test | 43 -
.../tokudb/mysql-test/tokudb_bugs/t/tokudb718.test | 13 +
.../mysql-test/tokudb_bugs/t/tokudb_mrr.test | 462 -
.../mysql-test/tokudb_bugs/t/tokudb_mrr2.test | 213 -
storage/tokudb/mysql-test/tokudb_bugs/t/xa-3.test | 1 +
storage/tokudb/mysql-test/tokudb_bugs/t/xa-4.test | 1 +
.../mysql-test/tokudb_mariadb/r/autoinc.result | 36 +
storage/tokudb/mysql-test/tokudb_mariadb/suite.opt | 2 +-
.../mysql-test/tokudb_mariadb/t/autoinc.test | 51 +
.../scripts/atc.ontime/atc_ontime_create.sql | 95 -
.../atc.ontime/atc_ontime_create_covered.sql | 103 -
.../tokudb/scripts/atc.ontime/nodistinct.q8.sql | 2 -
storage/tokudb/scripts/atc.ontime/q0.result | 2 -
storage/tokudb/scripts/atc.ontime/q0.sql | 1 -
storage/tokudb/scripts/atc.ontime/q1.result | 8 -
storage/tokudb/scripts/atc.ontime/q1.sql | 1 -
storage/tokudb/scripts/atc.ontime/q2.result | 8 -
storage/tokudb/scripts/atc.ontime/q2.sql | 1 -
storage/tokudb/scripts/atc.ontime/q3.result | 11 -
storage/tokudb/scripts/atc.ontime/q3.sql | 1 -
storage/tokudb/scripts/atc.ontime/q4.result | 21 -
storage/tokudb/scripts/atc.ontime/q4.sql | 1 -
storage/tokudb/scripts/atc.ontime/q5.result | 21 -
storage/tokudb/scripts/atc.ontime/q5.sql | 1 -
storage/tokudb/scripts/atc.ontime/q6.result | 21 -
storage/tokudb/scripts/atc.ontime/q6.sql | 1 -
storage/tokudb/scripts/atc.ontime/q7.result | 22 -
storage/tokudb/scripts/atc.ontime/q7.sql | 1 -
.../scripts/atc.ontime/q8.10y.destcityname.result | 11 -
.../scripts/atc.ontime/q8.10y.destcityname.sql | 1 -
storage/tokudb/scripts/atc.ontime/q8.10y.result | 11 -
storage/tokudb/scripts/atc.ontime/q8.10y.sql | 1 -
storage/tokudb/scripts/atc.ontime/q8.1y.sql | 1 -
storage/tokudb/scripts/atc.ontime/q8.1y.year5.sql | 1 -
storage/tokudb/scripts/atc.ontime/q8.2y.sql | 1 -
storage/tokudb/scripts/atc.ontime/q8.3y.sql | 1 -
storage/tokudb/scripts/atc.ontime/q8.4y.sql | 1 -
storage/tokudb/scripts/atc.ontime/q8.result | 11 -
storage/tokudb/scripts/atc.ontime/q8.sql | 1 -
storage/tokudb/scripts/atc.ontime/q8.year5.sql | 1 -
storage/tokudb/scripts/atc.ontime/q9.result | 22 -
storage/tokudb/scripts/atc.ontime/q9.sql | 1 -
storage/tokudb/scripts/atc.ontime/qcount.main.sql | 2 -
storage/tokudb/scripts/atc.ontime/qcount.result | 2 -
storage/tokudb/scripts/atc.ontime/qcount.sql | 1 -
storage/tokudb/scripts/atc.readme | 19 -
storage/tokudb/scripts/make.mysql.bash | 6 +-
storage/tokudb/scripts/make.mysql.debug.env.bash | 2 +-
.../scripts/nightly.mysql.build.and.test.bash | 58 -
.../scripts/nightly.mysql.build.and.test.my.cnf | 7 -
storage/tokudb/scripts/run.atc.ontime.bash | 267 -
storage/tokudb/scripts/run.iibench.bash | 172 -
storage/tokudb/scripts/run.mysql.tests.bash | 196 -
storage/tokudb/scripts/run.sql.bench.bash | 153 -
storage/tokudb/scripts/run.tpch.bash | 342 -
storage/tokudb/scripts/setup.mysql.bash | 231 -
storage/tokudb/scripts/test.mysql.bash | 51 -
storage/tokudb/scripts/testbuildfromsrc.bash | 32 -
storage/tokudb/scripts/testsandbox.bash | 32 -
storage/tokudb/scripts/tokustat.py | 32 +-
storage/tokudb/scripts/tpch.readme | 34 -
storage/tokudb/tests/Makefile | 25 +-
storage/tokudb/tests/card_test.cc | 13 +
storage/tokudb/tests/card_test_alter.cc | 686 +
storage/tokudb/tests/card_test_key_info.cc | 211 +
storage/tokudb/tests/fake_mysql.h | 3 +-
storage/tokudb/tests/math_test_int.cc | 263 +
storage/tokudb/tests/math_test_uint.cc | 214 +
storage/tokudb/tests/tokudb_math_test.cc | 376 -
storage/tokudb/tests/vlq_test.cc | 100 +-
storage/tokudb/tests/vlq_test_uint32.cc | 159 +
storage/tokudb/tests/vlq_test_uint64.cc | 170 +
storage/tokudb/tokudb_card.h | 11 +-
storage/xtradb/CMakeLists.txt | 39 +
storage/xtradb/btr/btr0cur.c | 61 +-
storage/xtradb/buf/buf0buf.c | 1 +
storage/xtradb/buf/buf0flu.c | 10 +-
storage/xtradb/dict/dict0crea.c | 42 +-
storage/xtradb/dict/dict0dict.c | 118 +-
storage/xtradb/dict/dict0load.c | 94 +-
storage/xtradb/dict/dict0mem.c | 15 +-
storage/xtradb/handler/ha_innodb.cc | 22 +-
storage/xtradb/handler/ha_innodb.h | 1 -
storage/xtradb/handler/i_s.cc | 25 +
storage/xtradb/include/dict0dict.h | 51 +-
storage/xtradb/include/dict0dict.ic | 61 +-
storage/xtradb/include/dict0load.h | 12 +
storage/xtradb/include/dict0mem.h | 12 +-
storage/xtradb/include/log0log.h | 19 +
storage/xtradb/include/log0log.ic | 41 +
storage/xtradb/include/os0sync.h | 91 +-
storage/xtradb/include/os0sync.ic | 32 +
storage/xtradb/include/srv0srv.h | 2 +
storage/xtradb/include/sync0arr.h | 6 +
storage/xtradb/include/sync0rw.h | 8 +-
storage/xtradb/include/sync0rw.ic | 13 +-
storage/xtradb/include/sync0sync.h | 5 +
storage/xtradb/include/sync0sync.ic | 8 +-
storage/xtradb/include/univ.i | 4 +-
storage/xtradb/log/log0log.c | 19 -
storage/xtradb/log/log0online.c | 35 +-
storage/xtradb/os/os0stacktrace.c | 2 +-
storage/xtradb/os/os0sync.c | 19 +
storage/xtradb/row/row0ins.c | 12 +-
storage/xtradb/srv/srv0srv.c | 20 +-
storage/xtradb/sync/sync0arr.c | 67 +-
storage/xtradb/sync/sync0rw.c | 59 +-
storage/xtradb/sync/sync0sync.c | 27 +-
strings/ctype-mb.c | 4 +-
strings/decimal.c | 12 +-
support-files/mysql.5.5.39.spec | 2057 -
support-files/mysql.5.5.41.spec | 2064 +
support-files/mysql.spec.sh | 41 +-
tests/async_queries.c | 10 +-
tests/fork_big.pl | 2 +-
tests/fork_big2.pl | 2 +-
vio/viossl.c | 14 +-
vio/viosslfactories.c | 6 +-
win/packaging/CMakeLists.txt | 2 +-
1811 files changed, 389192 insertions(+), 128070 deletions(-)
diff --cc sql/sql_yacc.cc
index 975bdd1,d807fb8..0ff79f3
--- a/sql/sql_yacc.cc
+++ b/sql/sql_yacc.cc
@@@ -27014,10 -27152,10 +27152,10 @@@ yyreduce
}
break;
- case 1095:
+ case 1096:
/* Line 1455 of yacc.c */
- #line 7724 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
-#line 7729 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
++#line 7730 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
{
(yyval.simple_string)= (char*) YYLIP->get_cpp_tok_start();
}
@@@ -27232,9 -27359,9 +27359,9 @@@
case 1111:
/* Line 1455 of yacc.c */
-#line 7863 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
+#line 7864 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
{
- (yyval.item)= new (thd->mem_root) Item_func_istrue((yyvsp[(1) - (3)].item));
+ (yyval.item)= negate_expression(thd, (yyvsp[(2) - (2)].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
@@@ -27243,9 -27370,9 +27370,9 @@@
case 1112:
/* Line 1455 of yacc.c */
-#line 7869 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
+#line 7870 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
{
- (yyval.item)= new (thd->mem_root) Item_func_isnottrue((yyvsp[(1) - (4)].item));
+ (yyval.item)= new (thd->mem_root) Item_func_istrue((yyvsp[(1) - (3)].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
@@@ -27254,9 -27381,9 +27381,9 @@@
case 1113:
/* Line 1455 of yacc.c */
-#line 7875 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
+#line 7876 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
{
- (yyval.item)= new (thd->mem_root) Item_func_isfalse((yyvsp[(1) - (3)].item));
+ (yyval.item)= new (thd->mem_root) Item_func_isnottrue((yyvsp[(1) - (4)].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
@@@ -27265,9 -27392,9 +27392,9 @@@
case 1114:
/* Line 1455 of yacc.c */
-#line 7881 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
+#line 7882 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
{
- (yyval.item)= new (thd->mem_root) Item_func_isnotfalse((yyvsp[(1) - (4)].item));
+ (yyval.item)= new (thd->mem_root) Item_func_isfalse((yyvsp[(1) - (3)].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
@@@ -27276,9 -27403,9 +27403,9 @@@
case 1115:
/* Line 1455 of yacc.c */
-#line 7887 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
+#line 7888 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
{
- (yyval.item)= new (thd->mem_root) Item_func_isnull((yyvsp[(1) - (3)].item));
+ (yyval.item)= new (thd->mem_root) Item_func_isnotfalse((yyvsp[(1) - (4)].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
@@@ -27287,9 -27414,9 +27414,9 @@@
case 1116:
/* Line 1455 of yacc.c */
-#line 7893 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
+#line 7894 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
{
- (yyval.item)= new (thd->mem_root) Item_func_isnotnull((yyvsp[(1) - (4)].item));
+ (yyval.item)= new (thd->mem_root) Item_func_isnull((yyvsp[(1) - (3)].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
@@@ -27309,9 -27436,9 +27436,9 @@@
case 1119:
/* Line 1455 of yacc.c */
-#line 7909 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
+#line 7910 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
{
- (yyval.item)= new (thd->mem_root) Item_func_isnotnull((yyvsp[(1) - (4)].item));
+ (yyval.item)= new (thd->mem_root) Item_func_isnull((yyvsp[(1) - (3)].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
@@@ -27320,9 -27447,9 +27447,9 @@@
case 1120:
/* Line 1455 of yacc.c */
-#line 7915 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
+#line 7916 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
{
- (yyval.item)= new (thd->mem_root) Item_func_equal((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item));
+ (yyval.item)= new (thd->mem_root) Item_func_isnotnull((yyvsp[(1) - (4)].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
@@@ -27331,9 -27458,9 +27458,9 @@@
case 1121:
/* Line 1455 of yacc.c */
-#line 7921 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
+#line 7922 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
{
- (yyval.item)= (*(yyvsp[(2) - (3)].boolfunc2creator))(0)->create((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item));
+ (yyval.item)= new (thd->mem_root) Item_func_equal((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
@@@ -27342,9 -27469,9 +27469,9 @@@
case 1122:
/* Line 1455 of yacc.c */
-#line 7927 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
+#line 7928 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
{
- (yyval.item)= all_any_subquery_creator((yyvsp[(1) - (6)].item), (yyvsp[(2) - (6)].boolfunc2creator), (yyvsp[(3) - (6)].num), (yyvsp[(5) - (6)].select_lex));
+ (yyval.item)= (*(yyvsp[(2) - (3)].boolfunc2creator))(0)->create((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
@@@ -27364,8 -27491,19 +27491,19 @@@
case 1125:
/* Line 1455 of yacc.c */
-#line 7943 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
+#line 7944 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
{
+ (yyval.item)= new (thd->mem_root) Item_in_subselect((yyvsp[(1) - (5)].item), (yyvsp[(4) - (5)].select_lex));
+ if ((yyval.item) == NULL)
+ MYSQL_YYABORT;
+ }
+ break;
+
+ case 1126:
+
+ /* Line 1455 of yacc.c */
+ #line 7949 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
+ {
Item *item= new (thd->mem_root) Item_in_subselect((yyvsp[(1) - (6)].item), (yyvsp[(5) - (6)].select_lex));
if (item == NULL)
MYSQL_YYABORT;
@@@ -27519,20 -27657,9 +27657,9 @@@
case 1139:
/* Line 1455 of yacc.c */
-#line 8048 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
+#line 8049 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
{
- (yyval.item)= new (thd->mem_root) Item_func_bit_and((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item));
+ (yyval.item)= new (thd->mem_root) Item_func_bit_or((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
@@@ -27541,9 -27668,9 +27668,9 @@@
case 1140:
/* Line 1455 of yacc.c */
-#line 8054 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
+#line 8055 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
{
- (yyval.item)= new (thd->mem_root) Item_func_shift_left((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item));
+ (yyval.item)= new (thd->mem_root) Item_func_bit_and((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
@@@ -27552,9 -27679,9 +27679,9 @@@
case 1141:
/* Line 1455 of yacc.c */
-#line 8060 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
+#line 8061 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
{
- (yyval.item)= new (thd->mem_root) Item_func_shift_right((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item));
+ (yyval.item)= new (thd->mem_root) Item_func_shift_left((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
@@@ -27563,9 -27690,9 +27690,9 @@@
case 1142:
/* Line 1455 of yacc.c */
-#line 8066 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
+#line 8067 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
{
- (yyval.item)= new (thd->mem_root) Item_func_plus((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item));
+ (yyval.item)= new (thd->mem_root) Item_func_shift_right((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
@@@ -27574,9 -27701,9 +27701,9 @@@
case 1143:
/* Line 1455 of yacc.c */
-#line 8072 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
+#line 8073 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
{
- (yyval.item)= new (thd->mem_root) Item_func_minus((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item));
+ (yyval.item)= new (thd->mem_root) Item_func_plus((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
@@@ -27585,9 -27712,9 +27712,9 @@@
case 1144:
/* Line 1455 of yacc.c */
-#line 8078 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
+#line 8079 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
{
- (yyval.item)= new (thd->mem_root) Item_date_add_interval((yyvsp[(1) - (5)].item),(yyvsp[(4) - (5)].item),(yyvsp[(5) - (5)].interval),0);
+ (yyval.item)= new (thd->mem_root) Item_func_minus((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
@@@ -27596,9 -27723,9 +27723,9 @@@
case 1145:
/* Line 1455 of yacc.c */
-#line 8084 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
+#line 8085 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
{
- (yyval.item)= new (thd->mem_root) Item_date_add_interval((yyvsp[(1) - (5)].item),(yyvsp[(4) - (5)].item),(yyvsp[(5) - (5)].interval),1);
+ (yyval.item)= new (thd->mem_root) Item_date_add_interval((yyvsp[(1) - (5)].item),(yyvsp[(4) - (5)].item),(yyvsp[(5) - (5)].interval),0);
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
@@@ -27607,9 -27734,9 +27734,9 @@@
case 1146:
/* Line 1455 of yacc.c */
-#line 8090 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
+#line 8091 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
{
- (yyval.item)= new (thd->mem_root) Item_func_mul((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item));
+ (yyval.item)= new (thd->mem_root) Item_date_add_interval((yyvsp[(1) - (5)].item),(yyvsp[(4) - (5)].item),(yyvsp[(5) - (5)].interval),1);
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
@@@ -27618,9 -27745,9 +27745,9 @@@
case 1147:
/* Line 1455 of yacc.c */
-#line 8096 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
+#line 8097 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
{
- (yyval.item)= new (thd->mem_root) Item_func_div((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item));
+ (yyval.item)= new (thd->mem_root) Item_func_mul((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
@@@ -27629,9 -27756,9 +27756,9 @@@
case 1148:
/* Line 1455 of yacc.c */
-#line 8102 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
+#line 8103 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
{
- (yyval.item)= new (thd->mem_root) Item_func_mod((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item));
+ (yyval.item)= new (thd->mem_root) Item_func_div((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
@@@ -27640,9 -27767,9 +27767,9 @@@
case 1149:
/* Line 1455 of yacc.c */
-#line 8108 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
+#line 8109 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
{
- (yyval.item)= new (thd->mem_root) Item_func_int_div((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item));
+ (yyval.item)= new (thd->mem_root) Item_func_mod((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
@@@ -28284,20 -28422,9 +28422,9 @@@
case 1225:
/* Line 1455 of yacc.c */
-#line 8524 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
+#line 8525 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
{
- (yyval.item)= new (thd->mem_root) Item_func_minute((yyvsp[(3) - (4)].item));
+ (yyval.item)= new (thd->mem_root) Item_func_left((yyvsp[(3) - (6)].item),(yyvsp[(5) - (6)].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
@@@ -28306,9 -28433,9 +28433,9 @@@
case 1226:
/* Line 1455 of yacc.c */
-#line 8530 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
+#line 8531 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
{
- (yyval.item)= new (thd->mem_root) Item_func_month((yyvsp[(3) - (4)].item));
+ (yyval.item)= new (thd->mem_root) Item_func_minute((yyvsp[(3) - (4)].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
@@@ -28317,9 -28444,9 +28444,9 @@@
case 1227:
/* Line 1455 of yacc.c */
-#line 8536 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
+#line 8537 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
{
- (yyval.item)= new (thd->mem_root) Item_func_right((yyvsp[(3) - (6)].item),(yyvsp[(5) - (6)].item));
+ (yyval.item)= new (thd->mem_root) Item_func_month((yyvsp[(3) - (4)].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
@@@ -28328,9 -28455,9 +28455,9 @@@
case 1228:
/* Line 1455 of yacc.c */
-#line 8542 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
+#line 8543 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
{
- (yyval.item)= new (thd->mem_root) Item_func_second((yyvsp[(3) - (4)].item));
+ (yyval.item)= new (thd->mem_root) Item_func_right((yyvsp[(3) - (6)].item),(yyvsp[(5) - (6)].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
@@@ -28339,9 -28466,9 +28466,9 @@@
case 1229:
/* Line 1455 of yacc.c */
-#line 8548 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
+#line 8549 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
{
- (yyval.item)= new (thd->mem_root) Item_time_typecast((yyvsp[(3) - (4)].item), AUTO_SEC_PART_DIGITS);
+ (yyval.item)= new (thd->mem_root) Item_func_second((yyvsp[(3) - (4)].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
@@@ -28350,9 -28477,9 +28477,9 @@@
case 1230:
/* Line 1455 of yacc.c */
-#line 8554 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
+#line 8555 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
{
- (yyval.item)= new (thd->mem_root) Item_datetime_typecast((yyvsp[(3) - (4)].item), AUTO_SEC_PART_DIGITS);
+ (yyval.item)= new (thd->mem_root) Item_time_typecast((yyvsp[(3) - (4)].item), AUTO_SEC_PART_DIGITS);
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
@@@ -28361,9 -28488,9 +28488,9 @@@
case 1231:
/* Line 1455 of yacc.c */
-#line 8560 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
+#line 8561 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
{
- (yyval.item)= new (thd->mem_root) Item_func_add_time((yyvsp[(3) - (6)].item), (yyvsp[(5) - (6)].item), 1, 0);
+ (yyval.item)= new (thd->mem_root) Item_datetime_typecast((yyvsp[(3) - (4)].item), AUTO_SEC_PART_DIGITS);
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
@@@ -28372,9 -28499,9 +28499,9 @@@
case 1232:
/* Line 1455 of yacc.c */
-#line 8566 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
+#line 8567 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
{
- (yyval.item)= new (thd->mem_root) Item_func_trim((yyvsp[(3) - (4)].item));
+ (yyval.item)= new (thd->mem_root) Item_func_add_time((yyvsp[(3) - (6)].item), (yyvsp[(5) - (6)].item), 1, 0);
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
@@@ -28383,9 -28510,9 +28510,9 @@@
case 1233:
/* Line 1455 of yacc.c */
-#line 8572 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
+#line 8573 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
{
- (yyval.item)= new (thd->mem_root) Item_func_ltrim((yyvsp[(6) - (7)].item),(yyvsp[(4) - (7)].item));
+ (yyval.item)= new (thd->mem_root) Item_func_trim((yyvsp[(3) - (4)].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
@@@ -28394,9 -28521,9 +28521,9 @@@
case 1234:
/* Line 1455 of yacc.c */
-#line 8578 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
+#line 8579 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
{
- (yyval.item)= new (thd->mem_root) Item_func_rtrim((yyvsp[(6) - (7)].item),(yyvsp[(4) - (7)].item));
+ (yyval.item)= new (thd->mem_root) Item_func_ltrim((yyvsp[(6) - (7)].item),(yyvsp[(4) - (7)].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
@@@ -28405,9 -28532,9 +28532,9 @@@
case 1235:
/* Line 1455 of yacc.c */
-#line 8584 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
+#line 8585 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
{
- (yyval.item)= new (thd->mem_root) Item_func_trim((yyvsp[(6) - (7)].item),(yyvsp[(4) - (7)].item));
+ (yyval.item)= new (thd->mem_root) Item_func_rtrim((yyvsp[(6) - (7)].item),(yyvsp[(4) - (7)].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
@@@ -28416,9 -28543,9 +28543,9 @@@
case 1236:
/* Line 1455 of yacc.c */
-#line 8590 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
+#line 8591 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
{
- (yyval.item)= new (thd->mem_root) Item_func_ltrim((yyvsp[(5) - (6)].item));
+ (yyval.item)= new (thd->mem_root) Item_func_trim((yyvsp[(6) - (7)].item),(yyvsp[(4) - (7)].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
@@@ -28427,9 -28554,9 +28554,9 @@@
case 1237:
/* Line 1455 of yacc.c */
-#line 8596 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
+#line 8597 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
{
- (yyval.item)= new (thd->mem_root) Item_func_rtrim((yyvsp[(5) - (6)].item));
+ (yyval.item)= new (thd->mem_root) Item_func_ltrim((yyvsp[(5) - (6)].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
@@@ -28438,9 -28565,9 +28565,9 @@@
case 1238:
/* Line 1455 of yacc.c */
-#line 8602 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
+#line 8603 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
{
- (yyval.item)= new (thd->mem_root) Item_func_trim((yyvsp[(5) - (6)].item));
+ (yyval.item)= new (thd->mem_root) Item_func_rtrim((yyvsp[(5) - (6)].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
@@@ -28449,9 -28576,9 +28576,9 @@@
case 1239:
/* Line 1455 of yacc.c */
-#line 8608 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
+#line 8609 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
{
- (yyval.item)= new (thd->mem_root) Item_func_trim((yyvsp[(5) - (6)].item),(yyvsp[(3) - (6)].item));
+ (yyval.item)= new (thd->mem_root) Item_func_trim((yyvsp[(5) - (6)].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
@@@ -28460,13 -28587,11 +28587,11 @@@
case 1240:
/* Line 1455 of yacc.c */
-#line 8614 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
+#line 8615 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
{
- (yyval.item)= new (thd->mem_root) Item_func_user();
+ (yyval.item)= new (thd->mem_root) Item_func_trim((yyvsp[(5) - (6)].item),(yyvsp[(3) - (6)].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
- Lex->set_stmt_unsafe(LEX::BINLOG_STMT_UNSAFE_SYSTEM_FUNCTION);
- Lex->safe_to_cache_query=0;
}
break;
@@@ -28507,12 -28634,11 +28634,11 @@@
case 1244:
/* Line 1455 of yacc.c */
-#line 8656 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
+#line 8657 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
{
- (yyval.item)= new (thd->mem_root) Item_func_curdate_local();
+ (yyval.item)= new (thd->mem_root) Item_date_add_interval((yyvsp[(3) - (8)].item), (yyvsp[(6) - (8)].item), (yyvsp[(7) - (8)].interval), 0);
if ((yyval.item) == NULL)
MYSQL_YYABORT;
- Lex->safe_to_cache_query=0;
}
break;
@@@ -28553,9 -28680,9 +28680,9 @@@
case 1248:
/* Line 1455 of yacc.c */
-#line 8684 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
+#line 8685 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
{
- (yyval.item)=new (thd->mem_root) Item_extract( (yyvsp[(3) - (6)].interval), (yyvsp[(5) - (6)].item));
+ (yyval.item)= new (thd->mem_root) Item_date_add_interval((yyvsp[(3) - (8)].item),(yyvsp[(6) - (8)].item),(yyvsp[(7) - (8)].interval),1);
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
@@@ -28564,9 -28691,9 +28691,9 @@@
case 1249:
/* Line 1455 of yacc.c */
-#line 8690 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
+#line 8691 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
{
- (yyval.item)= new (thd->mem_root) Item_func_get_format((yyvsp[(3) - (6)].date_time_type), (yyvsp[(5) - (6)].item));
+ (yyval.item)=new (thd->mem_root) Item_extract( (yyvsp[(3) - (6)].interval), (yyvsp[(5) - (6)].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
@@@ -28575,12 -28702,11 +28702,11 @@@
case 1250:
/* Line 1455 of yacc.c */
-#line 8696 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
+#line 8697 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
{
- (yyval.item)= new (thd->mem_root) Item_func_now_local((yyvsp[(2) - (2)].num));
+ (yyval.item)= new (thd->mem_root) Item_func_get_format((yyvsp[(3) - (6)].date_time_type), (yyvsp[(5) - (6)].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
- Lex->safe_to_cache_query=0;
}
break;
@@@ -28598,10 -28725,9 +28725,9 @@@
case 1252:
/* Line 1455 of yacc.c */
-#line 8709 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
+#line 8710 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
{
- (yyval.item)= new (thd->mem_root) Item_date_add_interval((yyvsp[(3) - (6)].item), (yyvsp[(5) - (6)].item),
- INTERVAL_DAY, 1);
+ (yyval.item) = new (thd->mem_root) Item_func_locate((yyvsp[(5) - (6)].item),(yyvsp[(3) - (6)].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
@@@ -28621,9 -28748,9 +28748,9 @@@
case 1254:
/* Line 1455 of yacc.c */
-#line 8722 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
+#line 8723 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
{
- (yyval.item)= new (thd->mem_root) Item_func_substr((yyvsp[(3) - (8)].item),(yyvsp[(5) - (8)].item),(yyvsp[(7) - (8)].item));
+ (yyval.item)= new (thd->mem_root) Item_date_add_interval((yyvsp[(3) - (8)].item), (yyvsp[(6) - (8)].item), (yyvsp[(7) - (8)].interval), 1);
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
@@@ -28632,9 -28759,9 +28759,9 @@@
case 1255:
/* Line 1455 of yacc.c */
-#line 8728 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
+#line 8729 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
{
- (yyval.item)= new (thd->mem_root) Item_func_substr((yyvsp[(3) - (6)].item),(yyvsp[(5) - (6)].item));
+ (yyval.item)= new (thd->mem_root) Item_func_substr((yyvsp[(3) - (8)].item),(yyvsp[(5) - (8)].item),(yyvsp[(7) - (8)].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
@@@ -28643,9 -28770,9 +28770,9 @@@
case 1256:
/* Line 1455 of yacc.c */
-#line 8734 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
+#line 8735 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
{
- (yyval.item)= new (thd->mem_root) Item_func_substr((yyvsp[(3) - (8)].item),(yyvsp[(5) - (8)].item),(yyvsp[(7) - (8)].item));
+ (yyval.item)= new (thd->mem_root) Item_func_substr((yyvsp[(3) - (6)].item),(yyvsp[(5) - (6)].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
@@@ -28654,9 -28781,9 +28781,9 @@@
case 1257:
/* Line 1455 of yacc.c */
-#line 8740 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
+#line 8741 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
{
- (yyval.item)= new (thd->mem_root) Item_func_substr((yyvsp[(3) - (6)].item),(yyvsp[(5) - (6)].item));
+ (yyval.item)= new (thd->mem_root) Item_func_substr((yyvsp[(3) - (8)].item),(yyvsp[(5) - (8)].item),(yyvsp[(7) - (8)].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
@@@ -28665,8 -28792,19 +28792,19 @@@
case 1258:
/* Line 1455 of yacc.c */
-#line 8746 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
+#line 8747 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
{
+ (yyval.item)= new (thd->mem_root) Item_func_substr((yyvsp[(3) - (6)].item),(yyvsp[(5) - (6)].item));
+ if ((yyval.item) == NULL)
+ MYSQL_YYABORT;
+ }
+ break;
+
+ case 1259:
+
+ /* Line 1455 of yacc.c */
+ #line 8752 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
+ {
/*
Unlike other time-related functions, SYSDATE() is
replication-unsafe because it is not affected by the
@@@ -28685,10 -28823,10 +28823,10 @@@
}
break;
- case 1259:
+ case 1260:
/* Line 1455 of yacc.c */
- #line 8765 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
-#line 8770 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
++#line 8771 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
{
(yyval.item)= new (thd->mem_root) Item_date_add_interval((yyvsp[(7) - (8)].item),(yyvsp[(5) - (8)].item),(yyvsp[(3) - (8)].interval_time_st),0);
if ((yyval.item) == NULL)
@@@ -28696,10 -28834,10 +28834,10 @@@
}
break;
- case 1260:
+ case 1261:
/* Line 1455 of yacc.c */
- #line 8771 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
-#line 8776 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
++#line 8777 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
{
(yyval.item)= new (thd->mem_root) Item_func_timestamp_diff((yyvsp[(5) - (8)].item),(yyvsp[(7) - (8)].item),(yyvsp[(3) - (8)].interval_time_st));
if ((yyval.item) == NULL)
@@@ -28815,20 -28953,9 +28953,9 @@@
case 1271:
/* Line 1455 of yacc.c */
-#line 8856 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
+#line 8857 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
{
- (yyval.item)= new (thd->mem_root) Item_func_charset((yyvsp[(3) - (4)].item));
+ (yyval.item)= new (thd->mem_root) Item_func_ascii((yyvsp[(3) - (4)].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
@@@ -28837,9 -28964,9 +28964,9 @@@
case 1272:
/* Line 1455 of yacc.c */
-#line 8862 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
+#line 8863 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
{
- (yyval.item)= new (thd->mem_root) Item_func_coalesce(* (yyvsp[(3) - (4)].item_list));
+ (yyval.item)= new (thd->mem_root) Item_func_charset((yyvsp[(3) - (4)].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
@@@ -28848,9 -28975,9 +28975,9 @@@
case 1273:
/* Line 1455 of yacc.c */
-#line 8868 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
+#line 8869 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
{
- (yyval.item)= new (thd->mem_root) Item_func_collation((yyvsp[(3) - (4)].item));
+ (yyval.item)= new (thd->mem_root) Item_func_coalesce(* (yyvsp[(3) - (4)].item_list));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
@@@ -28859,12 -28986,11 +28986,11 @@@
case 1274:
/* Line 1455 of yacc.c */
-#line 8874 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
+#line 8875 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
{
- (yyval.item)= new (thd->mem_root) Item_func_database();
+ (yyval.item)= new (thd->mem_root) Item_func_collation((yyvsp[(3) - (4)].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
- Lex->safe_to_cache_query=0;
}
break;
@@@ -28882,9 -29009,9 +29009,9 @@@
case 1276:
/* Line 1455 of yacc.c */
-#line 8887 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
+#line 8888 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
{
- (yyval.item)= new (thd->mem_root) Item_func_last_value(* (yyvsp[(3) - (4)].item_list));
+ (yyval.item)= new (thd->mem_root) Item_func_if((yyvsp[(3) - (8)].item),(yyvsp[(5) - (8)].item),(yyvsp[(7) - (8)].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
@@@ -28893,9 -29020,9 +29020,9 @@@
case 1277:
/* Line 1455 of yacc.c */
-#line 8893 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
+#line 8894 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
{
- (yyval.item)= new (thd->mem_root) Item_func_microsecond((yyvsp[(3) - (4)].item));
+ (yyval.item)= new (thd->mem_root) Item_func_last_value(* (yyvsp[(3) - (4)].item_list));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
@@@ -28904,9 -29031,9 +29031,9 @@@
case 1278:
/* Line 1455 of yacc.c */
-#line 8899 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
+#line 8900 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
{
- (yyval.item) = new (thd->mem_root) Item_func_mod((yyvsp[(3) - (6)].item), (yyvsp[(5) - (6)].item));
+ (yyval.item)= new (thd->mem_root) Item_func_microsecond((yyvsp[(3) - (4)].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
@@@ -28915,9 -29042,9 +29042,9 @@@
case 1279:
/* Line 1455 of yacc.c */
-#line 8905 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
+#line 8906 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
{
- (yyval.item)= new (thd->mem_root) Item_func_old_password((yyvsp[(3) - (4)].item));
+ (yyval.item) = new (thd->mem_root) Item_func_mod((yyvsp[(3) - (6)].item), (yyvsp[(5) - (6)].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
@@@ -28926,8 -29053,19 +29053,19 @@@
case 1280:
/* Line 1455 of yacc.c */
-#line 8911 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
+#line 8912 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
{
+ (yyval.item)= new (thd->mem_root) Item_func_old_password((yyvsp[(3) - (4)].item));
+ if ((yyval.item) == NULL)
+ MYSQL_YYABORT;
+ }
+ break;
+
+ case 1281:
+
+ /* Line 1455 of yacc.c */
+ #line 8917 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
+ {
Item* i1;
if (thd->variables.old_passwords)
i1= new (thd->mem_root) Item_func_old_password((yyvsp[(3) - (4)].item));
@@@ -29459,9 -29586,9 +29586,9 @@@
case 1320:
/* Line 1455 of yacc.c */
-#line 9274 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
+#line 9275 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
{
- (yyval.item)= new (thd->mem_root) Item_sum_min((yyvsp[(3) - (4)].item));
+ (yyval.item)= new (thd->mem_root) Item_sum_count(* (yyvsp[(5) - (7)].item_list));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
@@@ -29481,9 -29608,9 +29608,9 @@@
case 1322:
/* Line 1455 of yacc.c */
-#line 9291 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
+#line 9292 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
{
- (yyval.item)= new (thd->mem_root) Item_sum_max((yyvsp[(3) - (4)].item));
+ (yyval.item)= new (thd->mem_root) Item_sum_min((yyvsp[(4) - (5)].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
@@@ -29492,9 -29619,9 +29619,9 @@@
case 1323:
/* Line 1455 of yacc.c */
-#line 9297 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
+#line 9298 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
{
- (yyval.item)= new (thd->mem_root) Item_sum_max((yyvsp[(4) - (5)].item));
+ (yyval.item)= new (thd->mem_root) Item_sum_max((yyvsp[(3) - (4)].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
@@@ -29503,9 -29630,9 +29630,9 @@@
case 1324:
/* Line 1455 of yacc.c */
-#line 9303 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
+#line 9304 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
{
- (yyval.item)= new (thd->mem_root) Item_sum_std((yyvsp[(3) - (4)].item), 0);
+ (yyval.item)= new (thd->mem_root) Item_sum_max((yyvsp[(4) - (5)].item));
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
@@@ -29514,9 -29641,9 +29641,9 @@@
case 1325:
/* Line 1455 of yacc.c */
-#line 9309 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
+#line 9310 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
{
- (yyval.item)= new (thd->mem_root) Item_sum_variance((yyvsp[(3) - (4)].item), 0);
+ (yyval.item)= new (thd->mem_root) Item_sum_std((yyvsp[(3) - (4)].item), 0);
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
@@@ -29525,9 -29652,9 +29652,9 @@@
case 1326:
/* Line 1455 of yacc.c */
-#line 9315 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
+#line 9316 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
{
- (yyval.item)= new (thd->mem_root) Item_sum_std((yyvsp[(3) - (4)].item), 1);
+ (yyval.item)= new (thd->mem_root) Item_sum_variance((yyvsp[(3) - (4)].item), 0);
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
@@@ -29536,9 -29663,9 +29663,9 @@@
case 1327:
/* Line 1455 of yacc.c */
-#line 9321 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
+#line 9322 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
{
- (yyval.item)= new (thd->mem_root) Item_sum_variance((yyvsp[(3) - (4)].item), 1);
+ (yyval.item)= new (thd->mem_root) Item_sum_std((yyvsp[(3) - (4)].item), 1);
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
@@@ -29547,9 -29674,9 +29674,9 @@@
case 1328:
/* Line 1455 of yacc.c */
-#line 9327 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
+#line 9328 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
{
- (yyval.item)= new (thd->mem_root) Item_sum_sum((yyvsp[(3) - (4)].item), FALSE);
+ (yyval.item)= new (thd->mem_root) Item_sum_variance((yyvsp[(3) - (4)].item), 1);
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
@@@ -29558,9 -29685,9 +29685,9 @@@
case 1329:
/* Line 1455 of yacc.c */
-#line 9333 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
+#line 9334 "/home/buildbot/bzr/build/sql/sql_yacc.yy"
{
- (yyval.item)= new (thd->mem_root) Item_sum_sum((yyvsp[(4) - (5)].item), TRUE);
+ (yyval.item)= new (thd->mem_root) Item_sum_sum((yyvsp[(3) - (4)].item), FALSE);
if ((yyval.item) == NULL)
MYSQL_YYABORT;
}
diff --cc storage/tokudb/ft-index/ft/ft-ops.cc
index f9701ec,481d80f..493d89e
--- a/storage/tokudb/ft-index/ft/ft-ops.cc
+++ b/storage/tokudb/ft-index/ft/ft-ops.cc
@@@ -885,21 -844,17 +844,22 @@@ void toku_ftnode_clone_callback
cloned_node->dirty = node->dirty;
cloned_node->fullhash = node->fullhash;
cloned_node->n_children = node->n_children;
- cloned_node->totalchildkeylens = node->totalchildkeylens;
- XMALLOC_N(node->n_children-1, cloned_node->childkeys);
XMALLOC_N(node->n_children, cloned_node->bp);
// clone pivots
- for (int i = 0; i < node->n_children-1; i++) {
- toku_clone_dbt(&cloned_node->childkeys[i], node->childkeys[i]);
+ cloned_node->pivotkeys.create_from_pivot_keys(node->pivotkeys);
+ if (node->height > 0) {
+ // need to move messages here so that we don't serialize stale
+ // messages to the fresh tree - ft verify code complains otherwise.
+ toku_move_ftnode_messages_to_stale(ft, node);
}
+ if (node->height > 0) {
+ // need to move messages here so that we don't serialize stale
+ // messages to the fresh tree - ft verify code complains otherwise.
+ toku_move_ftnode_messages_to_stale(ft, node);
+ }
// clone partition
- ftnode_clone_partitions(node, cloned_node);
+ toku_ftnode_clone_partitions(node, cloned_node);
// clear dirty bit
node->dirty = 0;
@@@ -1090,12 -1043,8 +1048,10 @@@ exit
return;
}
+static void ft_bnc_move_messages_to_stale(FT ft, NONLEAF_CHILDINFO bnc);
+
// replace the child buffer with a compressed version of itself.
- static void
- compress_internal_node_partition(FTNODE node, int i, enum toku_compression_method compression_method)
- {
+ static void compress_internal_node_partition(FTNODE node, int i, enum toku_compression_method compression_method) {
// if we should evict, compress the
// message buffer into a sub_block
assert(BP_STATE(node, i) == PT_AVAIL);
diff --cc storage/tokudb/ha_tokudb_alter_56.cc
index 5062a2a,1a03dc8..34bee7d
--- a/storage/tokudb/ha_tokudb_alter_56.cc
+++ b/storage/tokudb/ha_tokudb_alter_56.cc
@@@ -528,11 -528,11 +528,14 @@@ bool ha_tokudb::inplace_alter_table(TAB
error = alter_table_expand_blobs(altered_table, ha_alter_info);
if (error == 0 && ctx->reset_card) {
- error = tokudb::set_card_from_status(share->status_block, ctx->alter_txn, table->s, altered_table->s);
+ error = tokudb::alter_card(share->status_block, ctx->alter_txn, table->s, altered_table->s);
+ }
+ if (error == 0 && ctx->optimize_needed) {
+ error = do_optimize(ha_thd());
}
+ if (error == 0 && ctx->optimize_needed) {
+ error = do_optimize(ha_thd());
+ }
#if (50600 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 50699) || \
(50700 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 50799)
--
Alioth's hooks/post-receive on /srv/git.debian.org/git/pkg-mysql/mariadb-5.5.git
More information about the Pkg-mysql-commits
mailing list