Merge pull request #12497 from jsoref/shorthands-for-seconds

Shorthands for seconds

diff --cc modules/lmdbbackend/lmdbbackend.cc
index 3e1b35a87cb46177ad615e2d5b8588ea9d9aa6ed,2518f2bdf028b70db9853e70a6c2f0d08878f91e..c9a47a613a62466239fbf35e2394074f41872c2d
--- 1/modules/lmdbbackend/lmdbbackend.cc
--- 2/modules/lmdbbackend/lmdbbackend.cc
+++ b/modules/lmdbbackend/lmdbbackend.cc
@@@ -1422,10 -810,10 +1422,10 @@@ void LMDBBackend::lookup(const QType& t
      d_matchkey = co(zoneId, relqname, type.getCode());
    }
  
 -  if (d_getcursor->lower_bound(d_matchkey, key, val) || key.get<StringView>().rfind(d_matchkey, 0) != 0) {
 +  if (d_getcursor->lower_bound(d_matchkey, key, val) || key.getNoStripHeader<StringView>().rfind(d_matchkey, 0) != 0) {
      d_getcursor.reset();
      if (d_dolog) {
-       g_log << Logger::Warning << "Query " << ((long)(void*)this) << ": " << d_dtime.udiffNoReset() << " usec to execute (found nothing)" << endl;
+       g_log << Logger::Warning << "Query " << ((long)(void*)this) << ": " << d_dtime.udiffNoReset() << " us to execute (found nothing)" << endl;
      }
      return;
    }

diff --cc pdns/dnsbulktest.cc
Simple merge

diff --cc pdns/dnsdist-carbon.cc
Simple merge

diff --cc pdns/dnsdist-lua-inspection.cc
Simple merge

diff --cc pdns/dnsdist-lua-rules.cc
Simple merge

diff --cc pdns/dnsdist-tcp.cc
Simple merge

diff --cc pdns/dnsdist.cc
Simple merge

diff --cc pdns/dnsreplay.cc
Simple merge

diff --cc pdns/dnsscope.cc
Simple merge

diff --cc pdns/dnssecinfra.cc
Simple merge

diff --cc pdns/recursordist/syncres.cc
Simple merge