Commit 00dd8b41 authored by Matěj Laitl's avatar Matěj Laitl
Browse files

MySqlEmbeddedStorage: fix failure to start embedded server because of wrong options

This was because we were passing --myisam-recover-options and this
options does not exist in MySQL 5.1 (and MariaDB). The *command-line*
option (as opposed to system variable name) to set recovery mode is
tricky:
MySQL <= 5.1: --myisam-recover [1]
MySQL >= 5.5: --myisam-recover-options, should also accept
              --myisam-recover [2]
MariaDB: --myisam-recover [3]

*However*, the *system variable name* has always been named
myisam_recover_options, that's why it worked in Amarok <= 2.8.

No need to backport this because of the above.

Simple fix is to rename the option to --myisam-recover

BUG: 323802
FIXED-IN: 2.9

[1] https://dev.mysql.com/doc/refman/5.1/en/myisam-start.html
[2] https://dev.mysql.com/doc/refman/5.5/en/myisam-start.html
[3] https://mariadb.com/kb/en/myisam-server-system-variables/
parent 61ff3fcb
......@@ -14,6 +14,7 @@ VERSION 2.9-Beta 1
compilers currently supported by KDE.
BUGFIXES:
* Fix failure to start embedded MySQL (with version 5.1 and MariaDB). (BR 323802)
* Fixed compilation with libc++ (used on OSX and FreeBSD). (BR 324075)
* Fixed crashes with Intel drivers due to Analyzer applet. (BR 323635)
* Fixed performance problem with large podcast feeds.
......
......@@ -60,7 +60,7 @@ MySqlEmbeddedStorage::MySqlEmbeddedStorage( const QString &storageLocation )
<< "--default-storage-engine=MyISAM"
<< "--innodb=OFF"
<< "--skip-grant-tables"
<< "--myisam-recover-options=FORCE"
<< "--myisam-recover=FORCE"
<< "--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