BIND 10 master, updated. 61446fd4004c89a7d568988776a0fc2c1b67046a [master] Merge branch 'trac1845'

[BIND 10 source code commits]

The branch, master has been updated
       via  61446fd4004c89a7d568988776a0fc2c1b67046a (commit)
       via  44d2850a0d3e96ad2b405aadb222a975c0462826 (commit)
       via  8a33648413f84e7a7be65db8890d217d91f7c8f6 (commit)
      from  4df912c903ef7469b0034f1750de4cf0711e9e2d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 61446fd4004c89a7d568988776a0fc2c1b67046a
Merge: 4df912c903ef7469b0034f1750de4cf0711e9e2d 44d2850a0d3e96ad2b405aadb222a975c0462826
Author: Jelte Jansen <jelte at isc.org>
Date:   Tue Apr 10 10:56:02 2012 +0200

    [master] Merge branch 'trac1845'

-----------------------------------------------------------------------

Summary of changes:
 src/lib/datasrc/tests/sqlite3_accessor_unittest.cc |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/tests/sqlite3_accessor_unittest.cc b/src/lib/datasrc/tests/sqlite3_accessor_unittest.cc
index 6a58c94..c36c94b 100644
--- a/src/lib/datasrc/tests/sqlite3_accessor_unittest.cc
+++ b/src/lib/datasrc/tests/sqlite3_accessor_unittest.cc
@@ -792,18 +792,27 @@ TEST_F(SQLite3Update, rollback) {
     checkRecords(*accessor, zone_id, "foo.bar.example.com.", expected_stored);
 }
 
-// TODO: ticket #1845
-TEST_F(SQLite3Update,  DISABLED_rollbackFailure) {
+TEST_F(SQLite3Update,  rollbackFailure) {
     // This test emulates a rare scenario of making rollback attempt fail.
     // The iterator is paused in the middle of getting records, which prevents
     // the rollback operation at the end of the test.
 
+    // Since SQLite3 version 3.7.11, rollbacks do not fail on pending
+    // transactions anymore, making this test fail (and moot), but the
+    // transactions will fail after it, so, depending on version,
+    // we test whether that happens and is caught
     string columns[DatabaseAccessor::COLUMN_COUNT];
     iterator = accessor->getRecords("example.com.", zone_id);
     EXPECT_TRUE(iterator->getNext(columns));
 
     accessor->startUpdateZone("example.com.", true);
+#if SQLITE_VERSION_NUMBER < 3007011
     EXPECT_THROW(accessor->rollback(), DataSourceError);
+    EXPECT_NO_THROW(iterator->getNext(columns));
+#else
+    EXPECT_NO_THROW(accessor->rollback());
+    EXPECT_THROW(iterator->getNext(columns), DataSourceError);
+#endif
 }
 
 TEST_F(SQLite3Update, commitConflict) {