[master] Merge branch 'trac324new2' with fixing conflict for

	src/lib/python/isc/notify/tests/testdata/test.sqlite3

diff --cc src/lib/datasrc/sqlite3_accessor.cc
Simple merge

diff --cc src/lib/datasrc/sqlite3_accessor.h
Simple merge

diff --cc src/lib/datasrc/tests/sqlite3_accessor_unittest.cc
index 46b1411af31decaf5970e36f6ae8b875161cd807,f421f7ec32a994197a4de4bf0d5c1ca53ae4a51d..6a58c9462e14357f7ea26ae060ac30b420da3106
--- 1/src/lib/datasrc/tests/sqlite3_accessor_unittest.cc
--- 2/src/lib/datasrc/tests/sqlite3_accessor_unittest.cc
+++ b/src/lib/datasrc/tests/sqlite3_accessor_unittest.cc
@@@ -1295,19 -1299,6 +1316,6 @@@ TEST_F(SQLite3Update, addDiffWithUpdate
      expected_stored.push_back(diff_end_data);
      expected_stored.push_back(diff_add_a_data);
  
 -    checkDiffs(expected_stored, accessor->getRecordDiff(zone_id));
 +    checkDiffs(expected_stored, accessor->getDiffs(zone_id, 1234, 1300));
  }
- 
- TEST_F(SQLite3Update, addDiffWithNoTable) {
-     // An attempt of adding diffs to an old version of database that doesn't
-     // have a diffs table.  This will fail in preparing the statement.
-     initAccessor(SQLITE_DBFILE_EXAMPLE + ".nodiffs", "IN");
-     zone_id = accessor->startUpdateZone("example.com.", false).second;
-     copy(diff_begin_data, diff_begin_data + DatabaseAccessor::DIFF_PARAM_COUNT,
-          diff_params);
-     EXPECT_THROW(accessor->addRecordDiff(zone_id, getVersion(diff_begin_data),
-                                          getOperation(diff_begin_data),
-                                          diff_params),
-                  SQLite3Error);
- }
  } // end anonymous namespace

diff --cc src/lib/python/isc/datasrc/tests/datasrc_test.py
Simple merge

diff --cc src/lib/python/isc/notify/tests/testdata/test.sqlite3
index 16060640ceb45365969b7fb00d98ef0ba16c2573,7617d4f3f027e89745339c80512548e624902d86..d6591818156bbe22c4275a69a61f5ac7cbdf5b50
Binary files differ