From 0b167b27cf4e12a70cf8728638d233a1144bac97 Mon Sep 17 00:00:00 2001 From: Marcin Siodelski Date: Mon, 26 Aug 2019 12:06:03 +0200 Subject: [#853, !26-p] Fixed a query selecting pd pool specific options. The options must be ordered by pd option id. --- src/hooks/dhcp/mysql_cb/mysql_query_macros_dhcp.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') 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( \ -- cgit v1.2.3