Merge 10.4 into 10.5

MariaDB · Feb 24, 2021 · f159061 · f159061
2 parents f33e57a + ad0f0d2
commit f159061
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/cmake/make_dist.cmake.in b/cmake/make_dist.cmake.in
@@ -43,6 +43,13 @@ IF(GIT_EXECUTABLE)
   MESSAGE(STATUS "Running git checkout-index")
   EXECUTE_PROCESS(
     COMMAND "${GIT_EXECUTABLE}" checkout-index --all --prefix=${PACKAGE_DIR}/
+    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+    RESULT_VARIABLE RESULT
+  )
+  IF(NOT RESULT EQUAL 0)
+    SET(GIT_EXECUTABLE)
+  ENDIF()
+  EXECUTE_PROCESS(
     COMMAND "${GIT_EXECUTABLE}" submodule foreach "${GIT_EXECUTABLE} checkout-index --all --prefix=${PACKAGE_DIR}/$path/"
     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
     RESULT_VARIABLE RESULT

diff --git a/storage/innobase/log/log0recv.cc b/storage/innobase/log/log0recv.cc
@@ -2640,8 +2640,6 @@ void recv_sys_t::apply(bool last_batch)
     srv_operation == SRV_OPERATION_RESTORE ||
     srv_operation == SRV_OPERATION_RESTORE_EXPORT;
 
-  ut_d(recv_no_log_write = recv_no_ibuf_operations);
-
   mtr_t mtr;
 
   if (!pages.empty())
@@ -3573,7 +3571,8 @@ recv_recovery_from_checkpoint_start(lsn_t flush_lsn)
 		mysql_mutex_unlock(&log_sys.mutex);
 
 		ib::error() << "Recovered only to lsn:"
-			    << recv_sys.recovered_lsn << " checkpoint_lsn: " << checkpoint_lsn;
+			    << recv_sys.recovered_lsn
+			    << " checkpoint_lsn: " << checkpoint_lsn;
 
 		return(DB_ERROR);
 	}
@@ -3606,6 +3605,8 @@ recv_recovery_from_checkpoint_start(lsn_t flush_lsn)
 
 	recv_sys.apply_log_recs = true;
 	recv_no_ibuf_operations = false;
+	ut_d(recv_no_log_write = srv_operation == SRV_OPERATION_RESTORE
+	     || srv_operation == SRV_OPERATION_RESTORE_EXPORT);
 
 	mutex_exit(&recv_sys.mutex);