X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=lib%2Fquery.cc;h=4ccd81046128052f3461622e8a58c5c63af782f0;hp=7eb73a130fdf610207e266abd6574edcd8df2dec;hb=70519319b59ca55d511c5b44ff8c299cbe93c572;hpb=92d8eae8f182e4eebc87d76f8d4f37e6c018883a

diff --git a/lib/query.cc b/lib/query.cc
index 7eb73a13..4ccd8104 100644
--- a/lib/query.cc
+++ b/lib/query.cc
@@ -299,9 +299,10 @@ _notmuch_query_search_documents (notmuch_query_t *query,
 
     } catch (const Xapian::Error &error) {
 	_notmuch_database_log (notmuch,
-			       "A Xapian exception occurred performing query: %s\n"
+			       "A Xapian exception occurred performing query: %s\n",
+			       error.get_msg().c_str());
+	_notmuch_database_log_append (notmuch,
 			       "Query string was: %s\n",
-			       error.get_msg().c_str(),
 			       query->query_string);
 
 	notmuch->exception_reported = TRUE;
@@ -605,18 +606,20 @@ _notmuch_query_count_documents (notmuch_query_t *query, const char *type, unsign
 	/*
 	 * Set the checkatleast parameter to the number of documents
 	 * in the database to make get_matches_estimated() exact.
+	 * Set the max parameter to 0 to avoid fetching documents we will discard.
 	 */
-	mset = enquire.get_mset (0, notmuch->xapian_db->get_doccount (),
+	mset = enquire.get_mset (0, 0,
 				 notmuch->xapian_db->get_doccount ());
 
 	count = mset.get_matches_estimated();
 
     } catch (const Xapian::Error &error) {
 	_notmuch_database_log (notmuch,
-			       "A Xapian exception occurred performing query: %s\n"
-			       "Query string was: %s\n",
-			       error.get_msg().c_str(),
-			       query->query_string);
+			       "A Xapian exception occurred performing query: %s\n",
+			       error.get_msg().c_str());
+	_notmuch_database_log_append (notmuch,
+				      "Query string was: %s\n",
+				      query->query_string);
 	return NOTMUCH_STATUS_XAPIAN_EXCEPTION;
     }