diff options
| author | Marcin Siodelski <marcin@isc.org> | 2019-08-26 12:06:03 +0200 |
|---|---|---|
| committer | Thomas Markwalder <tmark@isc.org> | 2019-08-26 15:39:05 +0200 |
| commit | 0b167b27cf4e12a70cf8728638d233a1144bac97 (patch) | |
| tree | 22ce18200f332edacab15098df0ba35377f61d9c /src | |
| parent | [#853, !26-p] Added user permissions check to kea-admin (diff) | |
| download | kea-0b167b27cf4e12a70cf8728638d233a1144bac97.tar.xz kea-0b167b27cf4e12a70cf8728638d233a1144bac97.zip | |
[#853, !26-p] Fixed a query selecting pd pool specific options.
The options must be ordered by pd option id.
Diffstat (limited to 'src')
| -rw-r--r-- | src/hooks/dhcp/mysql_cb/mysql_query_macros_dhcp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/hooks/dhcp/mysql_cb/mysql_query_macros_dhcp.h b/src/hooks/dhcp/mysql_cb/mysql_query_macros_dhcp.h index 0122556371..7353a145b1 100644 --- a/src/hooks/dhcp/mysql_cb/mysql_query_macros_dhcp.h +++ b/src/hooks/dhcp/mysql_cb/mysql_query_macros_dhcp.h @@ -237,7 +237,7 @@ namespace { "LEFT JOIN dhcp6_options AS y ON y.scope_id = 6 AND d.id = y.pd_pool_id " \ "LEFT JOIN dhcp6_options AS o ON o.scope_id = 1 AND s.subnet_id = o.dhcp6_subnet_id " \ #__VA_ARGS__ \ - " ORDER BY s.subnet_id, p.id, d.id, x.option_id, o.option_id" + " ORDER BY s.subnet_id, p.id, d.id, x.option_id, y.option_id, o.option_id" #define MYSQL_GET_SUBNET6_NO_TAG(...) \ MYSQL_GET_SUBNET6_COMMON( \ |