diff --git a/Docs/INFO_SRC b/Docs/INFO_SRC
index 35eb9f9925f17fef46759b314dfca421a2275624..6081962104d917732e214415661dcbdd855245f0 100644
--- a/Docs/INFO_SRC
+++ b/Docs/INFO_SRC
@@ -1,8 +1,8 @@
-commit: e9da78ee92c3f44b341a1a68504da72494a684b9
-date: 2019-04-30 23:58:14 +0300
-build-date: 2019-04-30 21:10:19 +0000 
-short: e9da78e
+commit: f92f313368a2f2a8bed116085a407ce522f7a52c
+date: 2019-05-07 16:41:07 -0400
+build-date: 2019-05-07 20:49:18 +0000 
+short: f92f313
 branch: HEAD
 
 
-MariaDB source 10.1.39
+MariaDB source 10.1.40
diff --git a/VERSION b/VERSION
index a7dbe7dfb74a1501d985751c59112f10f0202e4e..6c97b2be102fc75e2cd95f297c725dca48bc981d 100644
--- a/VERSION
+++ b/VERSION
@@ -1,3 +1,3 @@
 MYSQL_VERSION_MAJOR=10
 MYSQL_VERSION_MINOR=1
-MYSQL_VERSION_PATCH=39
+MYSQL_VERSION_PATCH=40
diff --git a/support-files/rpm/server-postin.sh b/support-files/rpm/server-postin.sh
index 57db9fd5d90a478b491aa08f641e4b8fa6a0b81b..0a5bac73f0b177deb6ad37497278dcd51477f484 100644
--- a/support-files/rpm/server-postin.sh
+++ b/support-files/rpm/server-postin.sh
@@ -53,6 +53,9 @@ if [ $1 = 1 ] ; then
   chown -R %{mysqld_user}:%{mysqld_group} $datadir
 
   if [ ! -e $datadir/mysql ]; then
+    # Create data directory
+    mkdir -p $datadir
+
     # Initiate databases
     %{_bindir}/mysql_install_db --rpm --user=%{mysqld_user}
   fi