- Update i386 patches to upstream ones and rename them

Obtained from:	https://github.com/facebook/rocksdb/commit/4b0b0201c9abb7675413ce25e5044b1c9a8853c8
		https://github.com/facebook/rocksdb/commit/90415cfebe90bda845b9ee3e5a00e86d4f80e02e
		https://github.com/facebook/rocksdb/commit/f171faa240ccd12ac05d54b7ea0a8c29d2f1d9d6

4 files changed, 35 insertions, 13 deletions

diff --git a/databases/rocksdb/files/patch-tools_db__stress.cc b/databases/rocksdb/files/patch-tools-db_stress.cc
index 8d5f916881ec..7a9c3b1b1543 100644
--- a/databases/rocksdb/files/patch-tools_db__stress.cc
+++ b/databases/rocksdb/files/patch-tools-db_stress.cc
@@ -1,3 +1,5 @@
+Obtained from:	https://github.com/facebook/rocksdb/commit/4b0b0201c9abb7675413ce25e5044b1c9a8853c8
+
 --- tools/db_stress.cc.orig	2015-08-31 18:23:39 UTC
 +++ tools/db_stress.cc
 @@ -222,7 +222,7 @@ DEFINE_int32(set_options_one_in, 0,
diff --git a/databases/rocksdb/files/patch-util_sst__dump_tool.cc b/databases/rocksdb/files/patch-util-sst_dump_tool.cc
index fa49385045ca..393cd8b9f705 100644
--- a/databases/rocksdb/files/patch-util_sst__dump_tool.cc
+++ b/databases/rocksdb/files/patch-util-sst_dump_tool.cc
@@ -1,11 +1,21 @@
+Obtained from:	https://github.com/facebook/rocksdb/commit/90415cfebe90bda845b9ee3e5a00e86d4f80e02e
+
 --- util/sst_dump_tool.cc.orig	2015-08-31 18:23:39 UTC
 +++ util/sst_dump_tool.cc
-@@ -164,7 +164,7 @@ int SstFileReader::ShowAllCompressionSiz
+@@ -12,6 +12,7 @@
+ #endif
+ 
+ #include <inttypes.h>
++#include "port/port.h"
+ 
+ namespace rocksdb {
+ 
+@@ -164,7 +165,7 @@ int SstFileReader::ShowAllCompressionSiz
    compress_type.insert(
        std::make_pair(CompressionType::kLZ4HCCompression, "kLZ4HCCompression"));
  
 -  fprintf(stdout, "Block Size: %lu\n", block_size);
-+  fprintf(stdout, "Block Size: %zu\n", block_size);
++  fprintf(stdout, "Block Size: %" ROCKSDB_PRIszt "\n", block_size);
  
    for (CompressionType i = CompressionType::kNoCompression;
         i != CompressionType::kLZ4HCCompression; i = CompressionType(i + 1)) {
diff --git a/databases/rocksdb/files/patch-utilities-checkpoint-checkpoint.cc b/databases/rocksdb/files/patch-utilities-checkpoint-checkpoint.cc
new file mode 100644
index 000000000000..5383729fb94b
--- /dev/null
+++ b/databases/rocksdb/files/patch-utilities-checkpoint-checkpoint.cc
@@ -0,0 +1,21 @@
+Obtained from:	https://github.com/facebook/rocksdb/commit/f171faa240ccd12ac05d54b7ea0a8c29d2f1d9d6
+
+--- utilities/checkpoint/checkpoint.cc.orig	2015-08-31 18:23:39 UTC
++++ utilities/checkpoint/checkpoint.cc
+@@ -24,6 +24,7 @@
+ #include "rocksdb/env.h"
+ #include "rocksdb/transaction_log.h"
+ #include "util/file_util.h"
++#include "port/port.h"
+ 
+ namespace rocksdb {
+ 
+@@ -131,7 +132,7 @@ Status CheckpointImpl::CreateCheckpoint(
+                    (type == kDescriptorFile) ? manifest_file_size : 0);
+     }
+   }
+-  Log(db_->GetOptions().info_log, "Number of log files %ld",
++  Log(db_->GetOptions().info_log, "Number of log files %" ROCKSDB_PRIszt,
+       live_wal_files.size());
+ 
+   // Link WAL files. Copy exact size of last one because it is the only one
diff --git a/databases/rocksdb/files/patch-utilities_checkpoint_checkpoint.cc b/databases/rocksdb/files/patch-utilities_checkpoint_checkpoint.cc
deleted file mode 100644
index 6703f37a390e..000000000000
--- a/databases/rocksdb/files/patch-utilities_checkpoint_checkpoint.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- utilities/checkpoint/checkpoint.cc.orig	2015-08-31 18:23:39 UTC
-+++ utilities/checkpoint/checkpoint.cc
-@@ -131,7 +131,7 @@ Status CheckpointImpl::CreateCheckpoint(
-                    (type == kDescriptorFile) ? manifest_file_size : 0);
-     }
-   }
--  Log(db_->GetOptions().info_log, "Number of log files %ld",
-+  Log(db_->GetOptions().info_log, "Number of log files %zu",
-       live_wal_files.size());
- 
-   // Link WAL files. Copy exact size of last one because it is the only one