From ec9d2ad3d8e2f487c415b74ff33fffc0e049f490 Mon Sep 17 00:00:00 2001
From: Jakub Janco <jjanco@redhat.com>
Date: Mon, 3 Sep 2018 13:32:40 +0200
Subject: [PATCH] Ignore-db-dir option is not available in MySQL 8

Related: BZ#1620520
---
 root-common/etc/my.cnf                                  | 3 ---
 root-common/usr/share/container-scripts/mysql/common.sh | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/root-common/etc/my.cnf b/root-common/etc/my.cnf
index 0844075..c2d5ede 100644
--- a/root-common/etc/my.cnf
+++ b/root-common/etc/my.cnf
@@ -6,7 +6,4 @@ symbolic-links = 0
 # http://www.percona.com/blog/2008/05/31/dns-achilles-heel-mysql-installation/
 skip_name_resolve
 
-# http://www.chriscalender.com/ignoring-the-lostfound-directory-in-your-datadir/
-ignore-db-dir=lost+found
-
 !includedir /etc/my.cnf.d
diff --git a/root-common/usr/share/container-scripts/mysql/common.sh b/root-common/usr/share/container-scripts/mysql/common.sh
index e988ff8..e6f2342 100644
--- a/root-common/usr/share/container-scripts/mysql/common.sh
+++ b/root-common/usr/share/container-scripts/mysql/common.sh
@@ -101,7 +101,7 @@ function initialize_database() {
     # Using --rpm since we need mysql_install_db behaves as in RPM
     log_and_run mysql_install_db --rpm --datadir=$MYSQL_DATADIR
   else
-    log_initialization ${MYSQL_PREFIX}/libexec/mysqld --initialize --datadir=$MYSQL_DATADIR --ignore-db-dir=lost+found
+    log_initialization ${MYSQL_PREFIX}/libexec/mysqld --initialize --datadir=$MYSQL_DATADIR
   fi
 
   # The '--initialize' option sets an auto generated root password.