[#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 0122556371d26f00587743a08b2c0f1da0e2d69f..7353a145b1b600600d8113fd91099b1ee286c7cd 100644 (file)
--- 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( \