Commit a07f44dd authored by Terje Rosten's avatar Terje Rosten Committed by Matěj Laitl
Browse files

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: default avatarTerje Rosten <terje.rosten@oracle.com>
Signed-off-by: default avatarStefano Pettini <stefano.pettini@gmail.com>

CCMAIL: Terje Rosten <terje.rosten@oracle.com>
BUG: 354255
REVIEW: 128157
FIXED-IN: 2.9
parent cb3e05e2
......@@ -6,6 +6,8 @@ VERSION 2.9.0
FEATURES:
CHANGES:
* Substitute deprecated MySQL option --myisam-recover for compatibility with
MySQL 5.7+ thanks to Terje Rosten, Stefano Pettini. (BR 354255)
BUGFIXES:
......
......@@ -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";
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment