[2282] Merge branch 'trac2219' into trac2282

diff --cc configure.ac
Simple merge

diff --cc src/lib/datasrc/memory/memory_client.cc
Simple merge

diff --cc src/lib/datasrc/memory/zone_finder.cc
index cb56b8f8b6a95429e84783925d27f3757c43f4cf,25c276427d58bde66955fc896c99859bc11f96e7..b3c8ba0243156409b9183d35207c943156a955b4
--- 1/src/lib/datasrc/memory/zone_finder.cc
--- 2/src/lib/datasrc/memory/zone_finder.cc
+++ b/src/lib/datasrc/memory/zone_finder.cc
@@@ -558,9 -626,13 +626,9 @@@ InMemoryZoneFinder::find_internal(cons
          LOG_DEBUG(logger, DBG_TRACE_DATA, DATASRC_MEM_ANY_SUCCESS).
              arg(name);
          return (createFindResult(rrclass_, zone_data_, SUCCESS, NULL, node,
-                                  wild, &name));
+                                  options, wild, &name));
      }
  
 -    const RdataSet* currds = node->getData();
 -    while (currds != NULL) {
 -        currds = currds->getNext();
 -    }
      found = RdataSet::find(node->getData(), type);
      if (found != NULL) {
          // Good, it is here