mirror of
https://gitlab.isc.org/isc-projects/kea
synced 2025-09-01 14:35:29 +00:00
[#1073] fixed rebase
This commit is contained in:
@@ -1917,7 +1917,7 @@ MySqlLeaseMgr::addLease(const Lease6Ptr& lease) {
|
|||||||
|
|
||||||
template <typename Exchange, typename LeaseCollection>
|
template <typename Exchange, typename LeaseCollection>
|
||||||
void
|
void
|
||||||
MySqlLeaseMgr::getLeaseCollection(MySqlLeaseContextPtr ctx,
|
MySqlLeaseMgr::getLeaseCollection(MySqlLeaseContextPtr& ctx,
|
||||||
StatementIndex stindex,
|
StatementIndex stindex,
|
||||||
MYSQL_BIND* bind,
|
MYSQL_BIND* bind,
|
||||||
Exchange& exchange,
|
Exchange& exchange,
|
||||||
@@ -1981,7 +1981,7 @@ MySqlLeaseMgr::getLeaseCollection(MySqlLeaseContextPtr ctx,
|
|||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
MySqlLeaseMgr::getLease(MySqlLeaseContextPtr ctx,
|
MySqlLeaseMgr::getLease(MySqlLeaseContextPtr& ctx,
|
||||||
StatementIndex stindex, MYSQL_BIND* bind,
|
StatementIndex stindex, MYSQL_BIND* bind,
|
||||||
Lease4Ptr& result) const {
|
Lease4Ptr& result) const {
|
||||||
// Create appropriate collection object and get all leases matching
|
// Create appropriate collection object and get all leases matching
|
||||||
@@ -2001,7 +2001,7 @@ MySqlLeaseMgr::getLease(MySqlLeaseContextPtr ctx,
|
|||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
MySqlLeaseMgr::getLease(MySqlLeaseContextPtr ctx,
|
MySqlLeaseMgr::getLease(MySqlLeaseContextPtr& ctx,
|
||||||
StatementIndex stindex, MYSQL_BIND* bind,
|
StatementIndex stindex, MYSQL_BIND* bind,
|
||||||
Lease6Ptr& result) const {
|
Lease6Ptr& result) const {
|
||||||
// Create appropriate collection object and get all leases matching
|
// Create appropriate collection object and get all leases matching
|
||||||
|
Reference in New Issue
Block a user