From: Marcin Siodelski <marcin@isc.org>
Date: Mon, 26 Aug 2019 10:06:03 +0000 (+0200)
Subject: [#853, !26-p] Fixed a query selecting pd pool specific options.
X-Git-Tag: Kea-1.6.0~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0b167b27cf4e12a70cf8728638d233a1144bac97;p=thirdparty%2Fkea.git

[#853, !26-p] Fixed a query selecting pd pool specific options.

The options must be ordered by pd option id.
---

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( \