BIND 10 master, updated. 356ffa38fc98b8587499aa004eff6af103cfaa78 Merge branch 'master' into trac950

[BIND 10 source code commits]

The branch, master has been updated
       via  356ffa38fc98b8587499aa004eff6af103cfaa78 (commit)
       via  9cc499cb83497dcf89dcaac8c7a59e84a0b4a0e1 (commit)
      from  50f16fdb5e03054e470dca9aba6408062c198fd7 (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 356ffa38fc98b8587499aa004eff6af103cfaa78
Merge: 9cc499cb83497dcf89dcaac8c7a59e84a0b4a0e1 50f16fdb5e03054e470dca9aba6408062c198fd7
Author: Shane Kerr <shane at isc.org>
Date:   Tue Jun 14 14:21:35 2011 +0200

    Merge branch 'master' into trac950

commit 9cc499cb83497dcf89dcaac8c7a59e84a0b4a0e1
Author: Shane Kerr <shane at isc.org>
Date:   Thu May 19 23:33:01 2011 +0200

    Remove error message for non-error condition in SQLite data source.

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

Summary of changes:
 src/lib/datasrc/messagedef.mes     |    4 ----
 src/lib/datasrc/sqlite3_datasrc.cc |    2 --
 2 files changed, 0 insertions(+), 6 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/messagedef.mes b/src/lib/datasrc/messagedef.mes
index 2fc5c6b..0374306 100644
--- a/src/lib/datasrc/messagedef.mes
+++ b/src/lib/datasrc/messagedef.mes
@@ -424,10 +424,6 @@ and type in the database.
 Debug information. The SQLite data source is trying to identify, which zone
 should hold this domain.
 
-% SQLITE_ENCLOSURE_BAD_CLASS class mismatch looking for a zone ('%1' and '%2')
-The SQLite data source can handle only one class at a time and it was asked
-to identify which zone is holding data of a different class.
-
 % SQLITE_ENCLOSURE_NOTFOUND no zone contains it
 Debug information. The last SQLITE_ENCLOSURE query was unsuccessful, there's
 no such zone in our data.
diff --git a/src/lib/datasrc/sqlite3_datasrc.cc b/src/lib/datasrc/sqlite3_datasrc.cc
index 22f035b..13d98ed 100644
--- a/src/lib/datasrc/sqlite3_datasrc.cc
+++ b/src/lib/datasrc/sqlite3_datasrc.cc
@@ -351,8 +351,6 @@ Sqlite3DataSrc::findClosestEnclosure(DataSrcMatch& match) const {
     LOG_DEBUG(logger, DBG_TRACE_DATA, DATASRC_SQLITE_ENCLOSURE).
         arg(match.getName());
     if (match.getClass() != getClass() && match.getClass() != RRClass::ANY()) {
-        LOG_ERROR(logger, DATASRC_SQLITE_ENCLOSURE_BAD_CLASS).arg(getClass()).
-            arg(match.getClass());
         return;
     }