Merge branch 'trac1397'

Conflicts:
	src/lib/dns/tests/rrset_unittest.cc

The merge conflict resolution was reviewed by Shane on Jabber.

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

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

diff --cc src/lib/datasrc/tests/memory/treenode_rrset_unittest.cc
Simple merge

diff --cc src/lib/dns/rrset.cc
Simple merge

diff --cc src/lib/dns/rrset.h
Simple merge

diff --cc src/lib/dns/tests/rrset_unittest.cc
index 6e7e78884152a976924faf8e82543c274187a6b6,6e85380a6f8b83b8dff7bb3f18f331b2da7caa2d..a91f97903ba2d4edb95f29137adf4c69b49b6fc2
--- 1/src/lib/dns/tests/rrset_unittest.cc
--- 2/src/lib/dns/tests/rrset_unittest.cc
+++ b/src/lib/dns/tests/rrset_unittest.cc
@@@ -157,24 -157,27 +157,36 @@@ TEST_F(RRsetTest, addRdataPtr) 
      rrset_a_empty.addRdata(createRdata(rrset_a_empty.getType(),
                                         rrset_a_empty.getClass(),
                                         "192.0.2.2"));
-     addRdataTestCommon(rrset_a);
+     addRdataTestCommon(rrset_a_empty);
 +}
  
 +TEST_F(RRsetTest, addRdataPtrMismatched) {
      // Pointer version of addRdata() doesn't type check and does allow to
      //add a different type of Rdata as a result.
 +
 +    // Type mismatch
      rrset_a_empty.addRdata(createRdata(RRType::NS(), RRClass::IN(),
                                         "ns.example.com."));
 -    EXPECT_EQ(3, rrset_a_empty.getRdataCount());
 +    EXPECT_EQ(1, rrset_a_empty.getRdataCount());
 +
 +    // Class mismatch
 +    rrset_ch_txt.addRdata(createRdata(RRType::TXT(), RRClass::IN(),
 +                                      "Test String"));
 +    EXPECT_EQ(1, rrset_ch_txt.getRdataCount());
  }
  
+ TEST_F(RRsetTest, addRdataString) {
+     rrset_a_empty.addRdata("192.0.2.1");
+     rrset_a_empty.addRdata("192.0.2.2");
+ 
+     addRdataTestCommon(rrset_a_empty);
+ 
+     // String version of addRdata() will throw for bad RDATA for
+     // RRType::A().
+     EXPECT_THROW(rrset_a_empty.addRdata("ns.example.com."), InvalidRdataText);
+     addRdataTestCommon(rrset_a_empty);
+ }
+ 
  TEST_F(RRsetTest, iterator) {
      // Iterator for an empty RRset.
      RdataIteratorPtr it = rrset_a_empty.getRdataIterator();