summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Petrunia <psergey@askmonty.org>2019-07-07 18:03:52 +0300
committerSergei Petrunia <psergey@askmonty.org>2019-07-07 18:17:17 +0300
commit9abdf11ed1797cfd303170091869d0d89faae6f1 (patch)
treef4955b9c624680738f3b556af90b180086656246
parent5ebef42238e67669a24571f4dd4821a246f85685 (diff)
downloadmariadb-git-bb-10.2-mdev19830.tar.gz
Update RocksDB the revision that fixes the compile error on power8bb-10.2-mdev19830
-rw-r--r--storage/rocksdb/build_rocksdb.cmake4
m---------storage/rocksdb/rocksdb0
2 files changed, 3 insertions, 1 deletions
diff --git a/storage/rocksdb/build_rocksdb.cmake b/storage/rocksdb/build_rocksdb.cmake
index 3ee915393df..ac1307f1037 100644
--- a/storage/rocksdb/build_rocksdb.cmake
+++ b/storage/rocksdb/build_rocksdb.cmake
@@ -222,7 +222,6 @@ set(ROCKSDB_SOURCES
db/flush_job.cc
db/flush_scheduler.cc
db/forward_iterator.cc
- db/in_memory_stats_history.cc
db/internal_stats.cc
db/log_reader.cc
db/logs_with_prep_tracker.cc
@@ -270,9 +269,11 @@ set(ROCKSDB_SOURCES
monitoring/histogram.cc
monitoring/histogram_windowing.cc
monitoring/instrumented_mutex.cc
+ monitoring/in_memory_stats_history.cc
monitoring/iostats_context.cc
monitoring/perf_context.cc
monitoring/perf_level.cc
+ monitoring/persistent_stats_history.cc
monitoring/statistics.cc
monitoring/thread_status_impl.cc
monitoring/thread_status_updater.cc
@@ -325,6 +326,7 @@ set(ROCKSDB_SOURCES
tools/ldb_cmd.cc
tools/ldb_tool.cc
tools/sst_dump_tool.cc
+ trace_replay/block_cache_tracer.cc
trace_replay/trace_replay.cc
util/bloom.cc
util/coding.cc
diff --git a/storage/rocksdb/rocksdb b/storage/rocksdb/rocksdb
-Subproject ba64a4cf52cce5cf180135e5aeddaa90b7887f9
+Subproject e731f4402258554812c46334dc0d9483e6cc769