From 483273734e8608ed68624d7a868f20672c859c95 Mon Sep 17 00:00:00 2001 From: Razvan Becheriu Date: Wed, 29 May 2019 14:08:39 +0300 Subject: [PATCH] [#637,!349] order pd pools by id in select query --- src/hooks/dhcp/mysql_cb/mysql_query_macros_dhcp.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- 2.47.2