From: Razvan Becheriu <razvan@isc.org>
Date: Wed, 29 May 2019 11:08:39 +0000 (+0300)
Subject: [#637,!349] order pd pools by id in select query
X-Git-Tag: Kea-1.6.0-beta2~327
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=483273734e8608ed68624d7a868f20672c859c95;p=thirdparty%2Fkea.git

[#637,!349] order pd pools by id in select query
---

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 748ea3ce8c..537ec1d7e4 100644
--- a/src/hooks/dhcp/mysql_cb/mysql_query_macros_dhcp.h
+++ b/src/hooks/dhcp/mysql_cb/mysql_query_macros_dhcp.h
@@ -201,7 +201,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 " \
     "WHERE (srv.tag = ? OR srv.id = 1) " #__VA_ARGS__ \
-    " ORDER BY s.subnet_id, p.id, x.option_id, o.option_id"
+    " ORDER BY s.subnet_id, p.id, d.id, x.option_id, o.option_id"
 #endif
 
 #ifndef MYSQL_GET_SHARED_NETWORK4