Merge branch 'master' into llvm_build_zstd

base/base/safeExit.cpp

@@ -1,7 +1,7 @@
 #if defined(OS_LINUX)
 #    include <sys/syscall.h>
 #endif
-#include <stdlib.h>
+#include <cstdlib>
 #include <unistd.h>
 #include <base/safeExit.h>
 #include <base/defines.h>

packages/clickhouse-server.init

@@ -120,7 +120,11 @@ use_cron()
     if [ -x "/bin/systemctl" ] && [ -f /etc/systemd/system/clickhouse-server.service ] && [ -d /run/systemd/system ]; then
         return 1
     fi
-    # 2. disabled by config
+    # 2. checking whether the config is existed
+    if [ ! -f "$CLICKHOUSE_CRONFILE" ]; then
+        return 1
+    fi
+    # 3. disabled by config
     if [ -z "$CLICKHOUSE_CRONFILE" ]; then
         return 2
     fi