From a07f44ddcd61bac1bb2f1e17cfc07d40a940bb5a Mon Sep 17 00:00:00 2001
From: Terje Rosten <terje.rosten@oracle.com>
Date: Fri, 23 Oct 2015 12:11:43 +0200
Subject: [PATCH 24/26] Substitute deprecated MySQL option --myisam-recover

Deprecated MySQL option --myisam-recover has been removed in MySQL 5.7,
replacement is --myisam-recover-options.

Use MYSQL_VERSION_ID to handle this.

Signed-off-by: Terje Rosten <terje.rosten@oracle.com>
Signed-off-by: Stefano Pettini <stefano.pettini@gmail.com>

CCMAIL: Terje Rosten <terje.rosten@oracle.com>
BUG: 354255
REVIEW: 128157
FIXED-IN: 2.9
---
 src/core-impl/storage/sql/mysqlestorage/MySqlEmbeddedStorage.cpp | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/src/core-impl/storage/sql/mysqlestorage/MySqlEmbeddedStorage.cpp b/src/core-impl/storage/sql/mysqlestorage/MySqlEmbeddedStorage.cpp
index 4a9568f..9fa791b 100644
--- a/src/core-impl/storage/sql/mysqlestorage/MySqlEmbeddedStorage.cpp
+++ b/src/core-impl/storage/sql/mysqlestorage/MySqlEmbeddedStorage.cpp
@@ -70,7 +70,11 @@ MySqlEmbeddedStorage::init( const QString &storageLocation )
                << "--default-storage-engine=MyISAM"
                << "--innodb=OFF"
                << "--skip-grant-tables"
+#if (defined(MYSQL_VERSION_ID)) && (MYSQL_VERSION_ID >= 50700)
+               << "--myisam-recover-options=FORCE"
+#else
                << "--myisam-recover=FORCE"
+#endif
                << "--key-buffer-size=16777216" // (16Mb)
                << "--character-set-server=utf8"
                << "--collation-server=utf8_bin";
-- 
2.7.4