Merge branch 'trac2825'

0840c03b · Thomas Markwalder · d3752093 · 4813e06c · 0840c03b · 0840c03b
Commit 0840c03b authored Mar 14, 2013 by Thomas Markwalder
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

src/lib/dhcpsrv/mysql_lease_mgr.cc src/lib/dhcpsrv/mysql_lease_mgr.cc +1 -1

src/lib/dhcpsrv/mysql_lease_mgr.h src/lib/dhcpsrv/mysql_lease_mgr.h +1 -1

No files found.
--- a/src/lib/dhcpsrv/mysql_lease_mgr.cc
+++ b/src/lib/dhcpsrv/mysql_lease_mgr.cc
@@ -21,7 +21,7 @@
 #include <dhcpsrv/mysql_lease_mgr.h>

 #include <boost/static_assert.hpp>
-#include <mysql/mysqld_error.h>
+#include <mysqld_error.h>

 #include <iostream>
 #include <iomanip>

--- a/src/lib/dhcpsrv/mysql_lease_mgr.h
+++ b/src/lib/dhcpsrv/mysql_lease_mgr.h
@@ -20,7 +20,7 @@

 #include <boost/scoped_ptr.hpp>
 #include <boost/utility.hpp>
-#include <mysql/mysql.h>
+#include <mysql.h>

 #include <time.h>