[master] Merge branch 'trac2098'

diff --cc src/lib/datasrc/memory/Makefile.am
index ef46abe6e8864554c8e4dafb9770b2d49d3f76d4,1fb3fe708364200d6f06caf43d89da1f3c73aaf3..b04647c36614b8e9e7a4d7d4e0e9d90479e3008b
--- 1/src/lib/datasrc/memory/Makefile.am
--- 2/src/lib/datasrc/memory/Makefile.am
+++ b/src/lib/datasrc/memory/Makefile.am
@@@ -12,8 -12,8 +12,9 @@@ noinst_LTLIBRARIES = libdatasrc_memory.
  
  libdatasrc_memory_la_SOURCES = domaintree.h
  libdatasrc_memory_la_SOURCES += rdataset.h rdataset.cc
+ libdatasrc_memory_la_SOURCES += treenode_rrset.h treenode_rrset.cc
  libdatasrc_memory_la_SOURCES += rdata_serialization.h rdata_serialization.cc
  libdatasrc_memory_la_SOURCES += zone_data.h zone_data.cc
 +libdatasrc_memory_la_SOURCES += segment_object_holder.h
  libdatasrc_memory_la_SOURCES += zone_table.h zone_table.cc
  EXTRA_DIST  = rdata_serialization_priv.cc

diff --cc src/lib/datasrc/memory/benchmarks/Makefile.am
index 81d56422cfab90f0a3f215623fbbf90af647956e,f4ae3eefc5f90176bbcb02732cca3feb72afb80e..3328699fb3f5aed48190bcd70be9f13f08b1f760
--- 1/src/lib/datasrc/memory/benchmarks/Makefile.am
--- 2/src/lib/datasrc/memory/benchmarks/Makefile.am
+++ b/src/lib/datasrc/memory/benchmarks/Makefile.am
@@@ -9,10 -9,12 +9,13 @@@ endi
  
  CLEANFILES = *.gcno *.gcda
  
- noinst_PROGRAMS = rdata_reader_bench
+ noinst_PROGRAMS = rdata_reader_bench rrset_render_bench
  
  rdata_reader_bench_SOURCES = rdata_reader_bench.cc
- 
  rdata_reader_bench_LDADD = $(top_builddir)/src/lib/datasrc/memory/libdatasrc_memory.la
 +rdata_reader_bench_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
  rdata_reader_bench_LDADD += $(top_builddir)/src/lib/dns/libb10-dns++.la
+ 
+ rrset_render_bench_SOURCES = rrset_render_bench.cc
+ rrset_render_bench_LDADD = $(top_builddir)/src/lib/datasrc/memory/libdatasrc_memory.la
+ rrset_render_bench_LDADD += $(top_builddir)/src/lib/dns/libb10-dns++.la