From: Francis Dupont <fdupont@isc.org>
Date: Fri, 8 Feb 2019 23:25:23 +0000 (+0100)
Subject: [463-ordering-using-timestamps-without-fractional-part-fails-on-mysql-8] Sort audits... 
X-Git-Tag: 397-cb-implement-mysqlconfigbackenddhcpv6_base~66
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=453e58d2514765d199ad72dfcc832ccf018c09b4;p=thirdparty%2Fkea.git

[463-ordering-using-timestamps-without-fractional-part-fails-on-mysql-8] Sort audits by id when the modification timestamps are the same
---

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 f2eba3eabe..bfbead612e 100644
--- a/src/hooks/dhcp/mysql_cb/mysql_query_macros_dhcp.h
+++ b/src/hooks/dhcp/mysql_cb/mysql_query_macros_dhcp.h
@@ -210,7 +210,7 @@ namespace {
     "INNER JOIN " #table_prefix "_server AS s" \
     "  ON r.server_id = s.id " \
     "WHERE (s.tag = ? OR s.id = 1) AND (r.modification_ts > ?) " \
-    "ORDER BY r.modification_ts"
+    "ORDER BY r.modification_ts, r.id"
 #endif
 
 #ifndef MYSQL_INSERT_GLOBAL_PARAMETER