--- DEBIAN/postinst_ORIG	2017-12-12 11:32:03.000000000 +0100
+++ DEBIAN/postinst	2017-12-12 11:36:44.000000000 +0100
@@ -114,7 +114,6 @@
     if [ ! -d "$mysql_statedir"       -a ! -L "$mysql_statedir"       ]; then mkdir "$mysql_statedir"; fi
     if [ ! -d "$mysql_statedir/mysql" -a ! -L "$mysql_statedir/mysql" ]; then mkdir "$mysql_statedir/mysql"; fi
     if [ ! -d "$mysql_newlogdir"      -a ! -L "$mysql_newlogdir"      ]; then mkdir "$mysql_newlogdir"; fi
-    if [ ! -d "$mysql_filesdir"      -a ! -L "$mysql_filesdir"      ]; then mkdir "$mysql_filesdir"; fi
     # When creating an ext3 jounal on an already mounted filesystem like e.g.
     # /var/lib/mysql, you get a .journal file that is not modifyable by chown.
     # The mysql_datadir must not be writable by the mysql user under any
@@ -131,8 +130,12 @@
       chown mysql:adm   $mysql_logdir/mysql.$i
       chmod 0640        $mysql_logdir/mysql.$i
     done
+    # Ensure the existence of the default files-dir. Assume correct permissions and ownership if it exists
+    if [ ! -d "$mysql_filesdir" -a ! -L "$mysql_filesdir" ]; then 
+	mkdir "$mysql_filesdir"
     chown -R mysql:mysql $mysql_filesdir
     chmod 700 $mysql_filesdir
+    fi
     set -e
 
     # This is important to avoid dataloss when there is a removed