[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [amarok] /: Substitute deprecated MySQL option --myisam-recover
From:       Matěj_Laitl <matej () laitl ! cz>
Date:       2016-08-07 9:23:58
Message-ID: E1bWKJK-0004NC-2z () code ! kde ! org
[Download RAW message or body]

Git commit a07f44ddcd61bac1bb2f1e17cfc07d40a940bb5a by Matěj Laitl, on behalf of \
Terje Rosten. Committed on 07/08/2016 at 09:05.
Pushed by laitl into branch 'master'.

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

M  +2    -0    ChangeLog
M  +4    -0    src/core-impl/storage/sql/mysqlestorage/MySqlEmbeddedStorage.cpp

http://commits.kde.org/amarok/a07f44ddcd61bac1bb2f1e17cfc07d40a940bb5a

diff --git a/ChangeLog b/ChangeLog
index fc04163..c036f8a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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:
 
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";


[prev in list] [next in list] [prev in thread] [next in thread]