From 4aeca5e53256a0a87b73694b5e7d2b5b2412d1d4 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 9 Sep 2010 09:32:43 +0200
Subject: Rework MySQL header inclusion

---
 odb/mysql/header.cxx | 2 +-
 odb/mysql/source.cxx | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/odb/mysql/header.cxx b/odb/mysql/header.cxx
index baaad86..695f301 100644
--- a/odb/mysql/header.cxx
+++ b/odb/mysql/header.cxx
@@ -411,7 +411,7 @@ namespace mysql
     ctx.os << endl
            << "#include <odb/mysql/version.hxx>" << endl
            << "#include <odb/mysql/forward.hxx>" << endl
-           << "#include <odb/mysql/mysql.hxx>" << endl
+           << "#include <odb/mysql/mysql-types.hxx>" << endl
            << endl;
 
     if (ctx.options.generate_query ())
diff --git a/odb/mysql/source.cxx b/odb/mysql/source.cxx
index 1a9e6c8..649e47f 100644
--- a/odb/mysql/source.cxx
+++ b/odb/mysql/source.cxx
@@ -1043,7 +1043,8 @@ namespace mysql
     ns >> ns_defines >> ns;
     ns_defines >> c;
 
-    ctx.os << "#include <odb/mysql/traits.hxx>" << endl
+    ctx.os << "#include <odb/mysql/mysql.hxx>" << endl
+           << "#include <odb/mysql/traits.hxx>" << endl
            << "#include <odb/mysql/database.hxx>" << endl
            << "#include <odb/mysql/transaction.hxx>" << endl
            << "#include <odb/mysql/connection.hxx>" << endl
-- 
cgit v1.1