[master] Merge branch 'trac2097'

diff --cc src/lib/datasrc/memory/Makefile.am
index e0f49cc4c1f046160c2614b2f3937811685f4f59,ff315ab7e03634d956f53a0079e1a47a4d969304..7cdc7369fe1f4bb6cffd8fc9216280959c6ddaf9
--- 1/src/lib/datasrc/memory/Makefile.am
--- 2/src/lib/datasrc/memory/Makefile.am
+++ b/src/lib/datasrc/memory/Makefile.am
@@@ -11,8 -11,7 +11,9 @@@ CLEANFILES = *.gcno *.gcda datasrc_mess
  noinst_LTLIBRARIES = libdatasrc_memory.la
  
  libdatasrc_memory_la_SOURCES = \
+       rdataset.h rdataset.cc \
        rdata_serialization.h rdata_serialization.cc \
        domaintree.h
 +libdatasrc_memory_la_SOURCES += zone_data.h
 +libdatasrc_memory_la_SOURCES += zone_table.h zone_table.cc
  EXTRA_DIST  = rdata_serialization_priv.cc

diff --cc src/lib/datasrc/memory/domaintree.h
Simple merge

diff --cc src/lib/datasrc/memory/rdata_serialization.h
Simple merge

diff --cc src/lib/datasrc/memory/tests/Makefile.am
index 6195cc700ae3dbda9f7450c348cb686876631a08,be9c318433aad7281be042d596e9edba6a99a74d..128b8e7f9579a46a421b3f17e242ea1e31c94391
--- 1/src/lib/datasrc/memory/tests/Makefile.am
--- 2/src/lib/datasrc/memory/tests/Makefile.am
+++ b/src/lib/datasrc/memory/tests/Makefile.am
@@@ -19,8 -19,8 +19,9 @@@ TESTS += run_unittest
  
  run_unittests_SOURCES = run_unittests.cc
  run_unittests_SOURCES += rdata_serialization_unittest.cc
+ run_unittests_SOURCES += rdataset_unittest.cc
  run_unittests_SOURCES += domaintree_unittest.cc
 +run_unittests_SOURCES += zone_table_unittest.cc
  
  run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
  run_unittests_LDFLAGS  = $(AM_LDFLAGS)  $(GTEST_LDFLAGS)