BIND 10 master, updated. abf4296a7becc39021bc31594b29fa540a86efff [2825] Entry added.
BIND 10 source code commits
bind10-changes at lists.isc.org
Thu Mar 14 17:50:46 UTC 2013
The branch, master has been updated
via abf4296a7becc39021bc31594b29fa540a86efff (commit)
via 0840c03b4269e5fb478905cb98f0bb04a5555bb8 (commit)
via 4813e06cf4e0a9d9f453890557b639715e081eca (commit)
from d3752093f7cca1ade17038ec16e52e9a86f31115 (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 abf4296a7becc39021bc31594b29fa540a86efff
Author: Thomas Markwalder <tmark at isc.org>
Date: Thu Mar 14 13:50:09 2013 -0400
[2825] Entry added.
commit 0840c03b4269e5fb478905cb98f0bb04a5555bb8
Merge: d375209 4813e06
Author: Thomas Markwalder <tmark at isc.org>
Date: Thu Mar 14 13:44:44 2013 -0400
Merge branch 'trac2825'
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 4 ++++
src/lib/dhcpsrv/mysql_lease_mgr.cc | 2 +-
src/lib/dhcpsrv/mysql_lease_mgr.h | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
-----------------------------------------------------------------------
diff --git a/ChangeLog b/ChangeLog
index b1541bb..0685a16 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+590. [bug] tmark
+ Modified "include" statements in DHCP MySQL lease manager code to
+ fix build problems if MySQL is installed in a non-standard location.
+ (Trac #2825, git 4813e06cf4e0a9d9f453890557b639715e081eca)
589. [bug] jelte
b10-cmdctl now automatically re-reads the user accounts file when
it is updated.
diff --git a/src/lib/dhcpsrv/mysql_lease_mgr.cc b/src/lib/dhcpsrv/mysql_lease_mgr.cc
index 01ce170..4b5c1e1 100644
--- 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>
diff --git a/src/lib/dhcpsrv/mysql_lease_mgr.h b/src/lib/dhcpsrv/mysql_lease_mgr.h
index 36101e6..6d8eb8c 100644
--- 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>
More information about the bind10-changes
mailing list