aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartijn Kaijser <martijn@xbmc.org>2016-02-04 21:27:03 +0100
committerMartijn Kaijser <martijn@xbmc.org>2016-02-04 21:27:03 +0100
commitb587e98911fcedc4b800cd923a882c7aeeaa2146 (patch)
treea6613f4c089f11376ae4d2d741136d2e7f1cd3f8
parentac50f91a5fa3ef13009690b0b0e9473ec295c75b (diff)
parentf991cb3bb760ab0901f8f42b8c4d6fea365d6709 (diff)
Merge pull request #9036 from MilhouseVH/fix_mysql_songs_backport16.0rc3-Jarvis
[mysql]: Fix limited songs query after #9005
-rw-r--r--xbmc/music/MusicDatabase.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/xbmc/music/MusicDatabase.cpp b/xbmc/music/MusicDatabase.cpp
index 2dce24847b..fe9e3d309e 100644
--- a/xbmc/music/MusicDatabase.cpp
+++ b/xbmc/music/MusicDatabase.cpp
@@ -3836,7 +3836,7 @@ bool CMusicDatabase::GetSongsFullByWhere(const std::string &baseDir, const Filte
strSQL += strSQLExtra;
else
//Apply where clause and limits to songview, then join as mutiple records in result set per song
- strSQL += " WHERE songview.idsong in (SELECT idsong FROM songview " + strSQLExtra + ")";
+ strSQL += " WHERE songview.idsong IN (SELECT idsong FROM (SELECT idsong FROM songview " + strSQLExtra + ") as temp)";
}
CLog::Log(LOGDEBUG, "%s query = %s", __FUNCTION__, strSQL.c_str());