Commit b7fb7034 authored by Lachlan Dufton's avatar Lachlan Dufton Committed by Matěj Laitl
Browse files

Fix bug 272346, unable to set MySQL password to 'password'

Praise Lachlan for spotting inconsistency between default value in .xml
file and in code.

BUG: 272346
FIXED-IN: 2.6
REVIEW: 104751
parent 9d7ecb5a
......@@ -69,6 +69,8 @@ Version 2.6-Beta 1
"1.2 GB free" is shown instead of "85% used"; thicker capacity bar.
BUGFIXES:
* Fix bug where MySQL password could not be set to 'password'; patch by
Lachlan Dufton. (BR 272346)
* Detection and elimination of stale and orphaned iPod tracks now works
correctly; users are notified about these when iPod is plugged in.
* iPod playlists now work correctly. (BR 289304)
......
/****************************************************************************************
* Copyright (c) 2008 Edward Toroshchin <edward.hades@gmail.com> *
* Copyright (c) 2009 Jeff Mitchell <mitchell@kde.org> *
* Copyright (c) 2012 Lachlan Dufton <dufton@gmail.com> *
* *
* This program is free software; you can redistribute it and/or modify it under *
* the terms of the GNU General Public License as published by the Free Software *
......@@ -76,7 +77,7 @@ MySqlServerStorage::MySqlServerStorage()
if( !mysql_real_connect( m_db,
Amarok::config( "MySQL" ).readEntry( "Host", "localhost" ).toUtf8(),
Amarok::config( "MySQL" ).readEntry( "User", "amarokuser" ).toUtf8(),
Amarok::config( "MySQL" ).readEntry( "Password", "" ).toUtf8(),
Amarok::config( "MySQL" ).readEntry( "Password", "password" ).toUtf8(),
NULL,
Amarok::config( "MySQL" ).readEntry( "Port", "3306" ).toInt(),
NULL,
......
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