From 8554bdcbef9ca73830a6249e606e1900a469132a Mon Sep 17 00:00:00 2001
From: Chris Wedgwood <cw@f00f.org>
Date: Thu, 11 Oct 2018 15:31:31 +0000
Subject: [PATCH] [MariaDB] Update/remove deprecated configuration

Change-Id: I18aa87602b63ecd051c21e007aff8cadccdd0cda
---
 mariadb/templates/etc/_00-base.cnf.tpl | 2 --
 mariadb/templates/etc/_my.cnf.tpl      | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/mariadb/templates/etc/_00-base.cnf.tpl b/mariadb/templates/etc/_00-base.cnf.tpl
index 5e2597f99..068d11306 100644
--- a/mariadb/templates/etc/_00-base.cnf.tpl
+++ b/mariadb/templates/etc/_00-base.cnf.tpl
@@ -75,11 +75,9 @@ table_definition_cache=1024
 # TODO(tomasz.paszkowski): This needs to by dynamic based on available RAM.
 innodb_buffer_pool_size=1024M
 innodb_doublewrite=0
-innodb_file_format=Barracuda
 innodb_file_per_table=1
 innodb_flush_method=O_DIRECT
 innodb_io_capacity=500
-innodb_locks_unsafe_for_binlog=1
 innodb_log_file_size=128M
 innodb_old_blocks_time=1000
 innodb_read_io_threads=8
diff --git a/mariadb/templates/etc/_my.cnf.tpl b/mariadb/templates/etc/_my.cnf.tpl
index c6900517a..6c94203af 100644
--- a/mariadb/templates/etc/_my.cnf.tpl
+++ b/mariadb/templates/etc/_my.cnf.tpl
@@ -17,7 +17,7 @@ limitations under the License.
 [mysqld]
 datadir=/var/lib/mysql
 basedir=/usr
-ignore-db-dir=lost+found
+ignore-db-dirs=lost+found
 
 [client-server]
 !includedir /etc/mysql/conf.d/