[#887,!572] rebased

diff --git a/src/lib/mysql/mysql_connection.h b/src/lib/mysql/mysql_connection.h
index 7bf3ff7363a95f553c6b3d30bf13f5b6d1d0ba1b..1c0d6d6b524847c99200228b793b4e4ef14066d1 100644 (file)
--- a/src/lib/mysql/mysql_connection.h
+++ b/src/lib/mysql/mysql_connection.h
@@ -10,10 +10,10 @@
 #include <database/database_connection.h>
 #include <database/db_exceptions.h>
 #include <database/db_log.h>
-#include <dhcpsrv/thread_resource_mgr.h>
 #include <exceptions/exceptions.h>
 #include <mysql/mysql_binding.h>
 #include <mysql/mysql_constants.h>
+#include <util/thread_resource.h>
 #include <boost/scoped_ptr.hpp>
 #include <mysql.h>
 #include <mysqld_error.h>
@@ -656,7 +656,7 @@ private:
 
     bool prepared_;      ///< Flag to indicate prepareStatements has been called
 
-    mutable isc::dhcp::ThreadResourceMgr<MySqlHolder> handles_;
+    mutable isc::dhcp::ThreadResource<MySqlHolder> handles_;
 };
 
 }  // namespace db