diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-02-24 08:54:44 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-02-24 08:54:44 +0200 |
| commit | f159061510c229893a88cb2bc1c520241465b172 (patch) | |
| tree | 2e1f007d9d273a0d3ca8f4746b152fe823241621 | |
| parent | f33e57a9e66f7e1790cb84b141381bb668e281a0 (diff) | |
| parent | ad0f0d2b1a037c1774bc0aecc8ed1e7cf1847e55 (diff) | |
| download | mariadb-git-f159061510c229893a88cb2bc1c520241465b172.tar.gz | |
Merge 10.4 into 10.5
| -rw-r--r-- | cmake/make_dist.cmake.in | 7 | ||||
| -rw-r--r-- | storage/innobase/log/log0recv.cc | 7 |
2 files changed, 11 insertions, 3 deletions
diff --git a/cmake/make_dist.cmake.in b/cmake/make_dist.cmake.in index 941b64c811f..9e9eb555951 100644 --- 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 index f234969e3d4..67f8a2b5277 100644 --- 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 @@ completed: 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 @@ completed: 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); |