Merge branch 'bb-10.2-mariarocks-merge' into 10.2

mysql-test/include/search_pattern_in_file.inc

@@ -18,6 +18,11 @@
 #    Optionally, SEARCH_ABORT can be set to "FOUND" or "NOT FOUND" and this
 #    will abort if the search result doesn't match the requested one.
 #
+#    Optionally, SEARCH_OUTPUT can be set to control the format of output.
+#    Supported formats:
+#     - (default)  : "FOUND n /pattern/ in FILE " or "NOT FOUND ..."
+#     - "matches"  : Each match is printed, on a separate line
+#
 #    In case of
 #    - SEARCH_FILE and/or SEARCH_PATTERN is not set
 #    - SEARCH_FILE cannot be opened
@@ -75,7 +80,14 @@ perl;
     my @matches=($content =~ m/$search_pattern/gs);
     my $res=@matches ? "FOUND " . scalar(@matches) : "NOT FOUND";
     $ENV{SEARCH_FILE} =~ s{^.*?([^/\\]+)$}{$1};
-    print "$res /$search_pattern/ in $ENV{SEARCH_FILE}\n";
+
+    if ($ENV{SEARCH_OUTPUT} eq "matches") {
+      foreach (@matches) {
+        print $_ . "\n";
+      }
+    } else {
+      print "$res /$search_pattern/ in $ENV{SEARCH_FILE}\n";
+    }
     die "$ENV{SEARCH_ABORT}\n"
-    if $ENV{SEARCH_ABORT} && $res =~ /^$ENV{SEARCH_ABORT}/;
+      if $ENV{SEARCH_ABORT} && $res =~ /^$ENV{SEARCH_ABORT}/;
 EOF

storage/rocksdb/CMakeLists.txt

@@ -43,6 +43,15 @@ IF (WIN32 AND CMAKE_SIZEOF_VOID_P EQUAL 4)
   SKIP_ROCKSDB_PLUGIN("32-Bit Windows are temporarily disabled")
 ENDIF()
 
+#
+# RocksDB's port/win/env_win.cc uses parts of Windows API that are not part
+# of the LEAN_AND_MEAN set. Ideally we should undef LEAN_AND_MEAN only for
+# that file, but REMOVE_DEFINITIONS only works per-directory?
+#
+IF (WIN32)
+  REMOVE_DEFINITIONS(-DWIN32_LEAN_AND_MEAN)
+ENDIF()
+
 # This plugin needs recent C++ compilers (it is using C++11 features)
 # Skip build for the old compilers
 SET(CXX11_FLAGS)
@@ -155,6 +164,9 @@ if (UNIX AND NOT APPLE)
 endif()
 
 TARGET_LINK_LIBRARIES(rocksdb rocksdb_aux_lib)
+  FIND_LIBRARY(LZ4_LIBRARY
+    NAMES liblz4${PIC_EXT}.a lz4
+    HINTS ${WITH_LZ4}/lib)
 
 IF(CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
 
@@ -182,8 +194,11 @@ IF(HAVE_SCHED_GETCPU)
 ENDIF()
 
 IF (WITH_TBB)
+  FIND_LIBRARY(TBB_LIBRARY
+    NAMES libtbb${PIC_EXT}.a tbb
+    HINTS ${WITH_TBB}/lib)
   SET(rocksdb_static_libs ${rocksdb_static_libs}
-  ${WITH_TBB}/lib/libtbb${PIC_EXT}.a)
+    ${TBB_LIBRARY})
   ADD_DEFINITIONS(-DTBB)
 ENDIF()
 

storage/rocksdb/build_rocksdb.cmake

@@ -178,6 +178,7 @@ set(ROCKSDB_SOURCES
         db/db_info_dumper.cc
         db/db_iter.cc
         db/dbformat.cc
+        db/error_handler.cc
         db/event_helpers.cc
         db/experimental.cc
         db/external_sst_file_ingestion_job.cc
@@ -188,6 +189,7 @@ set(ROCKSDB_SOURCES
         db/internal_stats.cc
         db/log_reader.cc
         db/log_writer.cc
+        db/logs_with_prep_tracker.cc
         db/malloc_stats.cc
         db/managed_iterator.cc
         db/memtable.cc
@@ -284,6 +286,7 @@ set(ROCKSDB_SOURCES
         util/coding.cc
         util/compaction_job_stats_impl.cc
         util/comparator.cc
+        util/compression_context_cache.cc
         util/concurrent_arena.cc
         util/crc32c.cc
         util/delete_scheduler.cc
@@ -304,6 +307,7 @@ set(ROCKSDB_SOURCES
         util/status_message.cc
         util/string_util.cc
         util/sync_point.cc
+        util/sync_point_impl.cc
         util/testutil.cc
         util/thread_local.cc
         util/threadpool_imp.cc
@@ -352,6 +356,8 @@ set(ROCKSDB_SOURCES
         utilities/transactions/transaction_util.cc
         utilities/transactions/write_prepared_txn.cc
         utilities/transactions/write_prepared_txn_db.cc
+        utilities/transactions/write_unprepared_txn.cc
+        utilities/transactions/write_unprepared_txn_db.cc
         utilities/ttl/db_ttl_impl.cc
         utilities/write_batch_with_index/write_batch_with_index.cc
         utilities/write_batch_with_index/write_batch_with_index_internal.cc