[Commits] 5cdb3fb25e7: Merge branch 'merge-tokudb-5.6' into 10.0

Oleksandr Byelkin sanja at mariadb.com
Mon Jan 28 21:16:12 EET 2019


revision-id: 5cdb3fb25e72d806b53fd7aa65b9320f4270f749 (mariadb-10.0.37-63-g5cdb3fb25e7)
parent(s): 724b09d5e726be612be6154a900bd907897d4124 13802fef831790c4b63a3ddbf96e516eff422464
author: Oleksandr Byelkin
committer: Oleksandr Byelkin
timestamp: 2019-01-28 20:15:57 +0100
message:

Merge branch 'merge-tokudb-5.6' into 10.0


 storage/tokudb/PerconaFT/COPYING.APACHEv2          |  174 ++
 storage/tokudb/PerconaFT/README.md                 |    5 +-
 storage/tokudb/PerconaFT/ft/txn/txn_manager.h      |    4 +-
 .../tokudb/PerconaFT/locktree/concurrent_tree.cc   |   14 +
 .../tokudb/PerconaFT/locktree/concurrent_tree.h    |   14 +
 storage/tokudb/PerconaFT/locktree/keyrange.cc      |   13 +
 storage/tokudb/PerconaFT/locktree/keyrange.h       |   13 +
 storage/tokudb/PerconaFT/locktree/lock_request.cc  |   13 +
 storage/tokudb/PerconaFT/locktree/lock_request.h   |   13 +
 storage/tokudb/PerconaFT/locktree/locktree.cc      |   13 +
 storage/tokudb/PerconaFT/locktree/locktree.h       |   13 +
 storage/tokudb/PerconaFT/locktree/manager.cc       |   13 +
 storage/tokudb/PerconaFT/locktree/range_buffer.cc  |   13 +
 storage/tokudb/PerconaFT/locktree/range_buffer.h   |   13 +
 storage/tokudb/PerconaFT/locktree/treenode.cc      |   13 +
 storage/tokudb/PerconaFT/locktree/treenode.h       |   13 +
 storage/tokudb/PerconaFT/locktree/txnid_set.cc     |   13 +
 storage/tokudb/PerconaFT/locktree/txnid_set.h      |   13 +
 storage/tokudb/PerconaFT/locktree/wfg.cc           |   13 +
 storage/tokudb/PerconaFT/locktree/wfg.h            |   13 +
 .../PerconaFT/portability/toku_instr_mysql.cc      |   12 +-
 .../PerconaFT/portability/toku_instr_mysql.h       |   11 +-
 .../tokudb/PerconaFT/portability/toku_pthread.h    |   78 +-
 storage/tokudb/PerconaFT/util/growable_array.h     |   13 +
 storage/tokudb/PerconaFT/util/omt.cc               | 2261 +++++++++++---------
 storage/tokudb/PerconaFT/util/omt.h                |   13 +
 storage/tokudb/ha_tokudb.cc                        |   10 +
 storage/tokudb/hatoku_hton.cc                      |    4 +-
 storage/tokudb/hatoku_hton.h                       |    1 -
 .../tokudb/mysql-test/tokudb_bugs/r/PS-4979.result |    2 +
 .../tokudb/mysql-test/tokudb_bugs/t/PS-4979.test   |   12 +
 storage/tokudb/tokudb_background.cc                |    4 +-
 storage/tokudb/tokudb_sysvars.cc                   |   14 +-
 storage/tokudb/tokudb_sysvars.h                    |    4 +-
 34 files changed, 1776 insertions(+), 1069 deletions(-)



More information about the commits mailing list