Looks like part of the initial approach taken by rt46268 accidentally
slipped through to the final solution (see RT #46268 for background
information):
$ git show 03be5a6b4e6 --stat bin/tests/system/filter-aaaa/ns*/*.db{,.in}
commit 03be5a6b4e
Author: Mukund Sivaraman <muks@isc.org>
Date: Sat Apr 22 08:25:10 2017 +0530
Improve performance for delegation heavy answers and also general query performance (#44029)
bin/tests/system/filter-aaaa/ns1/root.db | 12 ++++++++----
bin/tests/system/filter-aaaa/ns1/signed.db.in | 10 ++++++----
bin/tests/system/filter-aaaa/ns1/unsigned.db | 10 ++++++----
bin/tests/system/filter-aaaa/ns4/root.db | 16 ++++++++++------
bin/tests/system/filter-aaaa/ns4/signed.db.in | 10 ++++++----
bin/tests/system/filter-aaaa/ns4/unsigned.db | 10 ++++++----
6 files changed, 42 insertions(+), 26 deletions(-)
$ git show 666af25a92 --stat bin/tests/system/filter-aaaa/ns*/*.db{,.in}
commit 666af25a92
Author: Evan Hunt <each@isc.org>
Date: Fri Oct 13 10:28:34 2017 -0700
[v9_11] fix filter-aaaa test [RT #46268]
bin/tests/system/filter-aaaa/ns1/root.db | 12 ++++++++----
bin/tests/system/filter-aaaa/ns1/signed.db.in | 10 ++++++----
bin/tests/system/filter-aaaa/ns1/unsigned.db | 10 ++++++----
bin/tests/system/filter-aaaa/ns4/root.db | 16 ++++++++++------
bin/tests/system/filter-aaaa/ns4/signed.db.in | 10 ++++++----
bin/tests/system/filter-aaaa/ns4/unsigned.db | 10 ++++++----
6 files changed, 42 insertions(+), 26 deletions(-)
$ git show 666af25a92 --stat
commit 666af25a92
Author: Evan Hunt <each@isc.org>
Date: Fri Oct 13 10:28:34 2017 -0700
[v9_11] fix filter-aaaa test [RT #46268]
bin/tests/system/filter-aaaa/ns1/root.db | 12 ++++++++----
bin/tests/system/filter-aaaa/ns1/signed.db.in | 10 ++++++----
>>>> bin/tests/system/filter-aaaa/ns1/signed.db.presigned | 4 ++--
bin/tests/system/filter-aaaa/ns1/unsigned.db | 10 ++++++----
bin/tests/system/filter-aaaa/ns4/root.db | 16 ++++++++++------
bin/tests/system/filter-aaaa/ns4/signed.db.in | 10 ++++++----
bin/tests/system/filter-aaaa/ns4/unsigned.db | 10 ++++++----
bin/tests/system/filter-aaaa/tests.sh | 2 --
8 files changed, 44 insertions(+), 30 deletions(-)
This mistake is corrected in branch rt46283, please review.