From ebcd579152b4883c99b23a9443ee853c484cce48 Mon Sep 17 00:00:00 2001
From: Konstantin Osipov <kostja@tarantool.org>
Date: Sun, 2 Aug 2015 18:47:30 +0300
Subject: [PATCH] box: yet another fix for recovery_atfork(). set 1.6.6 tag
---
CMakeLists.txt | 2 +-
src/box/box.cc | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index abb1fc0992..61b72dea17 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -113,7 +113,7 @@ add_custom_target(tags COMMAND ctags -R -f tags
#
set (CPACK_PACKAGE_VERSION_MAJOR "1")
set (CPACK_PACKAGE_VERSION_MINOR "6")
-set (CPACK_PACKAGE_VERSION_PATCH "5")
+set (CPACK_PACKAGE_VERSION_PATCH "6")
set (PACKAGE_VERSION "")
diff --git a/src/box/box.cc b/src/box/box.cc
index 35b4143699..cb871ba1b1 100644
--- a/src/box/box.cc
+++ b/src/box/box.cc
@@ -502,6 +502,9 @@ box_load_cfg()
void
box_atfork()
{
+ /* NULL when forking for box.cfg{background = true} */
+ if (recovery == NULL)
+ return;
/* box.coredump() forks to save a core. */
recovery_atfork(recovery);
}
--
GitLab