public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in app-office/akonadi-server/files: akonadi-server-1.10.2-datastore_query_fix.patch
@ 2013-08-13 21:35 Maciej Mrozowski (reavertm)
  0 siblings, 0 replies; 2+ messages in thread
From: Maciej Mrozowski (reavertm) @ 2013-08-13 21:35 UTC (permalink / raw
  To: gentoo-commits

reavertm    13/08/13 21:35:45

  Added:                akonadi-server-1.10.2-datastore_query_fix.patch
  Log:
  Add fix for assert in datastore for certain queries.
  
  (Portage version: 2.2.0/cvs/Linux x86_64, signed Manifest commit with key B1E955DB)

Revision  Changes    Path
1.1                  app-office/akonadi-server/files/akonadi-server-1.10.2-datastore_query_fix.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/akonadi-server/files/akonadi-server-1.10.2-datastore_query_fix.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/akonadi-server/files/akonadi-server-1.10.2-datastore_query_fix.patch?rev=1.1&content-type=text/plain

Index: akonadi-server-1.10.2-datastore_query_fix.patch
===================================================================
commit d76aeb18fbc346e89481ce9b3157b4518e8485f7
Author: Volker Krause <vkrause@kde.org>
Date:   Wed Jul 31 17:14:10 2013 +0200

    Don't crash the server if all items already have the desired flags.
    
    This case subsequently hits an assert in the query builder for an empty
    IN condition.

diff --git a/server/src/storage/datastore.cpp b/server/src/storage/datastore.cpp
index 41a0927..40b8fe8 100644
--- a/server/src/storage/datastore.cpp
+++ b/server/src/storage/datastore.cpp
@@ -235,6 +235,9 @@ bool DataStore::doAppendItemsFlag( const PimItem::List &items, const Flag &flag,
     appendItems << item;
   }
 
+  if ( appendItems.isEmpty() )
+    return true; // all items have the desired flags already
+
   QueryBuilder qb2( PimItemFlagRelation::tableName(), QueryBuilder::Insert );
   qb2.setColumnValue( PimItemFlagRelation::leftColumn(), appendIds );
   qb2.setColumnValue( PimItemFlagRelation::rightColumn(), flagIds );





^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [gentoo-commits] gentoo-x86 commit in app-office/akonadi-server/files: akonadi-server-1.10.2-datastore_query_fix.patch
@ 2013-10-09 20:37 Johannes Huber (johu)
  0 siblings, 0 replies; 2+ messages in thread
From: Johannes Huber (johu) @ 2013-10-09 20:37 UTC (permalink / raw
  To: gentoo-commits

johu        13/10/09 20:37:48

  Removed:              akonadi-server-1.10.2-datastore_query_fix.patch
  Log:
  Version bump fixes bug #484572. Remove old.
  
  (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD)


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2013-10-09 20:37 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-08-13 21:35 [gentoo-commits] gentoo-x86 commit in app-office/akonadi-server/files: akonadi-server-1.10.2-datastore_query_fix.patch Maciej Mrozowski (reavertm)
  -- strict thread matches above, loose matches on Subject: below --
2013-10-09 20:37 Johannes Huber (johu)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox