1 files changed, 8 insertions, 12 deletions
diff --git a/odb/mysql/database.hxx b/odb/mysql/database.hxx
index 5e2ebc6..37b966f 100644
--- a/odb/mysql/database.hxx
+++ b/odb/mysql/database.hxx
@@ -19,7 +19,6 @@
 #include <odb/mysql/forward.hxx>
 #include <odb/mysql/connection.hxx>
 #include <odb/mysql/connection-factory.hxx>
-#include <odb/mysql/transaction-impl.hxx>
 
 #include <odb/details/shared-ptr.hxx>
 
@@ -29,12 +28,11 @@ namespace odb
 {
   namespace mysql
   {
+    class transaction_impl;
+
     class LIBODB_MYSQL_EXPORT database: public odb::database
     {
     public:
-      typedef mysql::connection connection_type;
-
-    public:
       // In MySQL, NULL and empty string are treated as the same value
       // for all the arguments except passwd and socket.
       //
@@ -159,23 +157,21 @@ namespace odb
       }
 
     public:
-      using odb::database::execute;
-
-      virtual unsigned long long
-      execute (const char* statement, std::size_t length);
-
-    public:
-      virtual transaction_impl*
+      transaction_impl*
       begin ();
 
     public:
-      details::shared_ptr<connection_type>
+      connection_ptr
       connection ();
 
     public:
       virtual
       ~database ();
 
+    protected:
+      virtual odb::connection*
+      connection_ ();
+
     private:
       std::string user_;
       std::string passwd_str_;