Two-phase queue run perf: parallel processes for phase one

[users/jgh/exim.git] / test / stderr / 2610

diff --git a/test/stderr/2610 b/test/stderr/2610
index 0a16c1109817f99235b46261e38fe3edce11341a..ef3e0a901b3b95d7ce5cab8feb21cd17ad7b654d 100644 (file)
--- a/test/stderr/2610
+++ b/test/stderr/2610
@@ -1,210 +1,211 @@
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user

-search_open: mysql "NULL"
-search_find: file="NULL"
-  key="select name from them where id='ph10';" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="NULL"
-  type=mysql key="select name from them where id='ph10';"
-database lookup required for select name from them where id='ph10';
-MySQL query: select name from them where id='ph10';
-MYSQL new connection: host=127.0.0.1 port=1223 socket=NULL database=test user=root
-lookup yielded: Philip Hazel
-search_open: mysql "NULL"
-  cached open
-search_find: file="NULL"
-  key="select name from them where id='ph10';" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="NULL"
-  type=mysql key="select name from them where id='ph10';"
-cached data used for lookup of select name from them where id='ph10';
-lookup yielded: Philip Hazel
-search_open: mysql "NULL"
-  cached open
-search_find: file="NULL"
-  key="select name from them where id='xxxx';" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="NULL"
-  type=mysql key="select name from them where id='xxxx';"
-database lookup required for select name from them where id='xxxx';
-MySQL query: select name from them where id='xxxx';
-MYSQL using cached connection for 127.0.0.1:1223/test/root
-MYSQL: no data found
-lookup failed
-search_open: mysql "NULL"
-  cached open
-search_find: file="NULL"
-  key="select name from them where id='nothing';" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="NULL"
-  type=mysql key="select name from them where id='nothing';"
-database lookup required for select name from them where id='nothing';
-MySQL query: select name from them where id='nothing';
-MYSQL using cached connection for 127.0.0.1:1223/test/root
-lookup yielded: 
-search_open: mysql "NULL"
-  cached open
-search_find: file="NULL"
-  key="select id,name from them where id='nothing';" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="NULL"
-  type=mysql key="select id,name from them where id='nothing';"
-database lookup required for select id,name from them where id='nothing';
-MySQL query: select id,name from them where id='nothing';
-MYSQL using cached connection for 127.0.0.1:1223/test/root
-lookup yielded: id=nothing name="" 
-search_open: mysql "NULL"
-  cached open
-search_find: file="NULL"
-  key="delete from them where id='nonexist';" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="NULL"
-  type=mysql key="delete from them where id='nonexist';"
-database lookup required for delete from them where id='nonexist';
-MySQL query: delete from them where id='nonexist';
-MYSQL using cached connection for 127.0.0.1:1223/test/root
-MYSQL: query was not one that returns data
-lookup forced cache cleanup
-lookup yielded: 0
-search_open: mysql "NULL"
-  cached open
-search_find: file="NULL"
-  key="select * from them where id='quote';" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="NULL"
-  type=mysql key="select * from them where id='quote';"
-database lookup required for select * from them where id='quote';
-MySQL query: select * from them where id='quote';
-MYSQL using cached connection for 127.0.0.1:1223/test/root
-MYSQL: no data found
-lookup failed
-search_open: mysql "NULL"
-  cached open
-search_find: file="NULL"
-  key="select * from them where id='filter';" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="NULL"
-  type=mysql key="select * from them where id='filter';"
-database lookup required for select * from them where id='filter';
-MySQL query: select * from them where id='filter';
-MYSQL using cached connection for 127.0.0.1:1223/test/root
-MYSQL: no data found
-lookup failed
-search_open: mysql "NULL"
-  cached open
-search_find: file="NULL"
-  key="select * from them where id='quote2';" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="NULL"
-  type=mysql key="select * from them where id='quote2';"
-database lookup required for select * from them where id='quote2';
-MySQL query: select * from them where id='quote2';
-MYSQL using cached connection for 127.0.0.1:1223/test/root
-lookup yielded: name="\"stquot" id=quote2 
-search_open: mysql "NULL"
-  cached open
-search_find: file="NULL"
-  key="select * from them where id='nlonly';" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="NULL"
-  type=mysql key="select * from them where id='nlonly';"
-database lookup required for select * from them where id='nlonly';
-MySQL query: select * from them where id='nlonly';
-MYSQL using cached connection for 127.0.0.1:1223/test/root
-MYSQL: no data found
-lookup failed
-search_open: mysql "NULL"
-  cached open
-search_find: file="NULL"
-  key="servers=x:127.0.0.1::1223; select name from them where id='ph10';" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="NULL"
-  type=mysql key="servers=x:127.0.0.1::1223; select name from them where id='ph10';"
-database lookup required for servers=x:127.0.0.1::1223; select name from them where id='ph10';
-MySQL query: servers=x:127.0.0.1::1223; select name from them where id='ph10';
-lookup deferred: MySQL server "x" not found in mysql_servers
-search_open: mysql "NULL"
-  cached open
-search_find: file="NULL"
-  key="servers=127.0.0.1::1223:x; select name from them where id='ph10';" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="NULL"
-  type=mysql key="servers=127.0.0.1::1223:x; select name from them where id='ph10';"
-database lookup required for servers=127.0.0.1::1223:x; select name from them where id='ph10';
-MySQL query: servers=127.0.0.1::1223:x; select name from them where id='ph10';
-MYSQL using cached connection for 127.0.0.1:1223/test/root
-lookup yielded: Philip Hazel
-search_open: mysql "NULL"
-  cached open
-search_find: file="NULL"
-  key="servers=127.0.0.1::1223/test/root/:x; select name from them where id='ph10';" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="NULL"
-  type=mysql key="servers=127.0.0.1::1223/test/root/:x; select name from them where id='ph10';"
-database lookup required for servers=127.0.0.1::1223/test/root/:x; select name from them where id='ph10';
-MySQL query: servers=127.0.0.1::1223/test/root/:x; select name from them where id='ph10';
-MYSQL using cached connection for 127.0.0.1:1223/test/root
-lookup yielded: Philip Hazel
-search_open: mysql "NULL"
-  cached open
-search_find: file="NULL"
-  key="servers=ip4.ip4.ip4.ip4::1223/test/root/:127.0.0.1::1223; select name from them where id='ph10';" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="NULL"
-  type=mysql key="servers=ip4.ip4.ip4.ip4::1223/test/root/:127.0.0.1::1223; select name from them where id='ph10';"
-database lookup required for servers=ip4.ip4.ip4.ip4::1223/test/root/:127.0.0.1::1223; select name from them where id='ph10';
-MySQL query: servers=ip4.ip4.ip4.ip4::1223/test/root/:127.0.0.1::1223; select name from them where id='ph10';
-MYSQL new connection: host=ip4.ip4.ip4.ip4 port=1223 socket=NULL database=test user=root
-lookup yielded: Philip Hazel
-search_open: mysql "NULL"
-  cached open
-search_find: file="NULL"
-  key="servers=localhost(TESTSUITE/mysql/sock)/test/root/; select name from them where id='ph10';" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="NULL"
-  type=mysql key="servers=localhost(TESTSUITE/mysql/sock)/test/root/; select name from them where id='ph10';"
-database lookup required for servers=localhost(TESTSUITE/mysql/sock)/test/root/; select name from them where id='ph10';
-MySQL query: servers=localhost(TESTSUITE/mysql/sock)/test/root/; select name from them where id='ph10';
-MYSQL new connection: host=localhost port=0 socket=TESTSUITE/mysql/sock database=test user=root
-lookup yielded: Philip Hazel
-search_open: mysql "NULL"
-  cached open
-search_find: file="NULL"
-  key="SELECT name FROM them WHERE id IN ('ph10', 'aaaa');" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="NULL"
-  type=mysql key="SELECT name FROM them WHERE id IN ('ph10', 'aaaa');"
-database lookup required for SELECT name FROM them WHERE id IN ('ph10', 'aaaa');
-MySQL query: SELECT name FROM them WHERE id IN ('ph10', 'aaaa');
-MYSQL using cached connection for 127.0.0.1:1223/test/root
-lookup yielded: Philip Hazel
-Aristotle
-search_open: mysql "NULL"
-  cached open
-search_find: file="NULL"
-  key="SELECT *    FROM them WHERE id IN ('ph10', 'aaaa');" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="NULL"
-  type=mysql key="SELECT *    FROM them WHERE id IN ('ph10', 'aaaa');"
-database lookup required for SELECT *    FROM them WHERE id IN ('ph10', 'aaaa');
-MySQL query: SELECT *    FROM them WHERE id IN ('ph10', 'aaaa');
-MYSQL using cached connection for 127.0.0.1:1223/test/root
-lookup yielded: name="Philip Hazel" id=ph10 
-name=Aristotle id=aaaa 
-search_open: mysql "NULL"
-  cached open
-search_find: file="NULL"
-  key="delete from them where id='aaaa'" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="NULL"
-  type=mysql key="delete from them where id='aaaa'"
-database lookup required for delete from them where id='aaaa'
-MySQL query: delete from them where id='aaaa'
-MYSQL using cached connection for 127.0.0.1:1223/test/root
-MYSQL: query was not one that returns data
-lookup forced cache cleanup
-lookup yielded: 1
+dropping to exim gid; retaining priv uid
+ search_open: mysql "NULL"
+ search_find: file="NULL"
+   key="select name from them where id='ph10';" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="NULL"
+   type=mysql key="select name from them where id='ph10';"
+ database lookup required for select name from them where id='ph10';
+ MySQL query: select name from them where id='ph10';
+ MYSQL new connection: host=127.0.0.1 port=1223 socket=NULL database=test user=root
+ lookup yielded: Philip Hazel
+ search_open: mysql "NULL"
+   cached open
+ search_find: file="NULL"
+   key="select name from them where id='ph10';" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="NULL"
+   type=mysql key="select name from them where id='ph10';"
+ cached data used for lookup of select name from them where id='ph10';
+ lookup yielded: Philip Hazel
+ search_open: mysql "NULL"
+   cached open
+ search_find: file="NULL"
+   key="select name from them where id='xxxx';" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="NULL"
+   type=mysql key="select name from them where id='xxxx';"
+ database lookup required for select name from them where id='xxxx';
+ MySQL query: select name from them where id='xxxx';
+ MYSQL using cached connection for 127.0.0.1:1223/test/root
+ MYSQL: no data found
+ lookup failed
+ search_open: mysql "NULL"
+   cached open
+ search_find: file="NULL"
+   key="select name from them where id='nothing';" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="NULL"
+   type=mysql key="select name from them where id='nothing';"
+ database lookup required for select name from them where id='nothing';
+ MySQL query: select name from them where id='nothing';
+ MYSQL using cached connection for 127.0.0.1:1223/test/root
+ lookup yielded: 
+ search_open: mysql "NULL"
+   cached open
+ search_find: file="NULL"
+   key="select id,name from them where id='nothing';" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="NULL"
+   type=mysql key="select id,name from them where id='nothing';"
+ database lookup required for select id,name from them where id='nothing';
+ MySQL query: select id,name from them where id='nothing';
+ MYSQL using cached connection for 127.0.0.1:1223/test/root
+ lookup yielded: id=nothing name="" 
+ search_open: mysql "NULL"
+   cached open
+ search_find: file="NULL"
+   key="delete from them where id='nonexist';" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="NULL"
+   type=mysql key="delete from them where id='nonexist';"
+ database lookup required for delete from them where id='nonexist';
+ MySQL query: delete from them where id='nonexist';
+ MYSQL using cached connection for 127.0.0.1:1223/test/root
+ MYSQL: query was not one that returns data
+ lookup forced cache cleanup
+ lookup yielded: 0
+ search_open: mysql "NULL"
+   cached open
+ search_find: file="NULL"
+   key="select * from them where id='quote';" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="NULL"
+   type=mysql key="select * from them where id='quote';"
+ database lookup required for select * from them where id='quote';
+ MySQL query: select * from them where id='quote';
+ MYSQL using cached connection for 127.0.0.1:1223/test/root
+ MYSQL: no data found
+ lookup failed
+ search_open: mysql "NULL"
+   cached open
+ search_find: file="NULL"
+   key="select * from them where id='filter';" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="NULL"
+   type=mysql key="select * from them where id='filter';"
+ database lookup required for select * from them where id='filter';
+ MySQL query: select * from them where id='filter';
+ MYSQL using cached connection for 127.0.0.1:1223/test/root
+ MYSQL: no data found
+ lookup failed
+ search_open: mysql "NULL"
+   cached open
+ search_find: file="NULL"
+   key="select * from them where id='quote2';" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="NULL"
+   type=mysql key="select * from them where id='quote2';"
+ database lookup required for select * from them where id='quote2';
+ MySQL query: select * from them where id='quote2';
+ MYSQL using cached connection for 127.0.0.1:1223/test/root
+ lookup yielded: name="\"stquot" id=quote2 
+ search_open: mysql "NULL"
+   cached open
+ search_find: file="NULL"
+   key="select * from them where id='nlonly';" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="NULL"
+   type=mysql key="select * from them where id='nlonly';"
+ database lookup required for select * from them where id='nlonly';
+ MySQL query: select * from them where id='nlonly';
+ MYSQL using cached connection for 127.0.0.1:1223/test/root
+ MYSQL: no data found
+ lookup failed
+ search_open: mysql "NULL"
+   cached open
+ search_find: file="NULL"
+   key="servers=x:127.0.0.1::1223; select name from them where id='ph10';" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="NULL"
+   type=mysql key="servers=x:127.0.0.1::1223; select name from them where id='ph10';"
+ database lookup required for servers=x:127.0.0.1::1223; select name from them where id='ph10';
+ MySQL query: servers=x:127.0.0.1::1223; select name from them where id='ph10';
+ lookup deferred: MySQL server "x" not found in mysql_servers
+ search_open: mysql "NULL"
+   cached open
+ search_find: file="NULL"
+   key="servers=127.0.0.1::1223:x; select name from them where id='ph10';" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="NULL"
+   type=mysql key="servers=127.0.0.1::1223:x; select name from them where id='ph10';"
+ database lookup required for servers=127.0.0.1::1223:x; select name from them where id='ph10';
+ MySQL query: servers=127.0.0.1::1223:x; select name from them where id='ph10';
+ MYSQL using cached connection for 127.0.0.1:1223/test/root
+ lookup yielded: Philip Hazel
+ search_open: mysql "NULL"
+   cached open
+ search_find: file="NULL"
+   key="servers=127.0.0.1::1223/test/root/:x; select name from them where id='ph10';" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="NULL"
+   type=mysql key="servers=127.0.0.1::1223/test/root/:x; select name from them where id='ph10';"
+ database lookup required for servers=127.0.0.1::1223/test/root/:x; select name from them where id='ph10';
+ MySQL query: servers=127.0.0.1::1223/test/root/:x; select name from them where id='ph10';
+ MYSQL using cached connection for 127.0.0.1:1223/test/root
+ lookup yielded: Philip Hazel
+ search_open: mysql "NULL"
+   cached open
+ search_find: file="NULL"
+   key="servers=ip4.ip4.ip4.ip4::1223/test/root/:127.0.0.1::1223; select name from them where id='ph10';" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="NULL"
+   type=mysql key="servers=ip4.ip4.ip4.ip4::1223/test/root/:127.0.0.1::1223; select name from them where id='ph10';"
+ database lookup required for servers=ip4.ip4.ip4.ip4::1223/test/root/:127.0.0.1::1223; select name from them where id='ph10';
+ MySQL query: servers=ip4.ip4.ip4.ip4::1223/test/root/:127.0.0.1::1223; select name from them where id='ph10';
+ MYSQL new connection: host=ip4.ip4.ip4.ip4 port=1223 socket=NULL database=test user=root
+ lookup yielded: Philip Hazel
+ search_open: mysql "NULL"
+   cached open
+ search_find: file="NULL"
+   key="servers=localhost(TESTSUITE/mysql/sock)/test/root/; select name from them where id='ph10';" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="NULL"
+   type=mysql key="servers=localhost(TESTSUITE/mysql/sock)/test/root/; select name from them where id='ph10';"
+ database lookup required for servers=localhost(TESTSUITE/mysql/sock)/test/root/; select name from them where id='ph10';
+ MySQL query: servers=localhost(TESTSUITE/mysql/sock)/test/root/; select name from them where id='ph10';
+ MYSQL new connection: host=localhost port=0 socket=TESTSUITE/mysql/sock database=test user=root
+ lookup yielded: Philip Hazel
+ search_open: mysql "NULL"
+   cached open
+ search_find: file="NULL"
+   key="SELECT name FROM them WHERE id IN ('ph10', 'aaaa');" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="NULL"
+   type=mysql key="SELECT name FROM them WHERE id IN ('ph10', 'aaaa');"
+ database lookup required for SELECT name FROM them WHERE id IN ('ph10', 'aaaa');
+ MySQL query: SELECT name FROM them WHERE id IN ('ph10', 'aaaa');
+ MYSQL using cached connection for 127.0.0.1:1223/test/root
+ lookup yielded: Philip Hazel
+ Aristotle
+ search_open: mysql "NULL"
+   cached open
+ search_find: file="NULL"
+   key="SELECT *    FROM them WHERE id IN ('ph10', 'aaaa');" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="NULL"
+   type=mysql key="SELECT *    FROM them WHERE id IN ('ph10', 'aaaa');"
+ database lookup required for SELECT *    FROM them WHERE id IN ('ph10', 'aaaa');
+ MySQL query: SELECT *    FROM them WHERE id IN ('ph10', 'aaaa');
+ MYSQL using cached connection for 127.0.0.1:1223/test/root
+ lookup yielded: name="Philip Hazel" id=ph10 
+ name=Aristotle id=aaaa 
+ search_open: mysql "NULL"
+   cached open
+ search_find: file="NULL"
+   key="delete from them where id='aaaa'" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="NULL"
+   type=mysql key="delete from them where id='aaaa'"
+ database lookup required for delete from them where id='aaaa'
+ MySQL query: delete from them where id='aaaa'
+ MYSQL using cached connection for 127.0.0.1:1223/test/root
+ MYSQL: query was not one that returns data
+ lookup forced cache cleanup
+ lookup yielded: 1

 search_tidyup called
 close MYSQL connection: localhost(TESTSUITE/mysql/sock)/test/root
 close MYSQL connection: ip4.ip4.ip4.ip4:1223/test/root
 search_tidyup called
 close MYSQL connection: localhost(TESTSUITE/mysql/sock)/test/root
 close MYSQL connection: ip4.ip4.ip4.ip4:1223/test/root


@@ -242,12 +243,12 @@ log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 SMTP>> 250 OK
 SMTP<< rcpt to:<c@d>
 using ACL "check_recipient"
 SMTP>> 250 OK
 SMTP<< rcpt to:<c@d>
 using ACL "check_recipient"

-processing "accept"
+processing "accept" (TESTSUITE/test-config 22)

 check domains = +local_domains
 d in "@"? no (end of list)
 d in "+local_domains"? no (end of list)
 accept: condition test failed in ACL "check_recipient"
 check domains = +local_domains
 d in "@"? no (end of list)
 d in "+local_domains"? no (end of list)
 accept: condition test failed in ACL "check_recipient"

-processing "accept"
+processing "accept" (TESTSUITE/test-config 23)

 check hosts = +relay_hosts
 search_open: mysql "NULL"
 search_find: file="NULL"
 check hosts = +relay_hosts
 search_open: mysql "NULL"
 search_find: file="NULL"


@@ -263,7 +264,7 @@ lookup failed
 host in "net-mysql;select * from them where id='10.0.0.0'"? no (end of list)
 host in "+relay_hosts"? no (end of list)
 accept: condition test failed in ACL "check_recipient"
 host in "net-mysql;select * from them where id='10.0.0.0'"? no (end of list)
 host in "+relay_hosts"? no (end of list)
 accept: condition test failed in ACL "check_recipient"

-processing "deny"
+processing "deny" (TESTSUITE/test-config 24)

   message: relay not permitted
 deny: condition test succeeded in ACL "check_recipient"
 end of ACL "check_recipient": DENY
   message: relay not permitted
 deny: condition test succeeded in ACL "check_recipient"
 end of ACL "check_recipient": DENY


@@ -312,26 +313,25 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for ph10@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for ph10@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-calling local_scan(); timeout=300
-local_scan() returned 0 NULL
-Writing spool header file: TESTSUITE/spool//input//hdr.pppp
-DSN: Write SPOOL :-dsn_envid NULL
-DSN: Write SPOOL :-dsn_ret 0
-DSN: Flags :0
-DSN: **** SPOOL_OUT - address: |ph10@myhost.test.ex| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00
+DSN: Write SPOOL: -dsn_envid NULL
+DSN: Write SPOOL  :-dsn_ret 0
+DSN: Flags: 0x0
+DSN: **** SPOOL_OUT - address: <ph10@myhost.test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0

 Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H
 Size of headers = sss
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 search_tidyup called
 Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H
 Size of headers = sss
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 search_tidyup called

-exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xfbb95cfd -odi -Mc 10HmaX-0005vi-00
+exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -odi -Mc 10HmaX-0005vi-00

 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=EXIM_GID pid=pppp
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=EXIM_GID pid=pppp
 configuration file is TESTSUITE/test-config
 trusted user
 admin user

+dropping to exim gid; retaining priv uid

 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 set_process_info: pppp delivering specified messages
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 set_process_info: pppp delivering specified messages


@@ -346,37 +346,37 @@ Empty Tree
 recipients_count=1
 **** SPOOL_IN - No additional fields
 body_linecount=1 message_linecount=7
 recipients_count=1
 **** SPOOL_IN - No additional fields
 body_linecount=1 message_linecount=7

-DSN: set orcpt:   flags: 0
+DSN: set orcpt:   flags: 0x0

 Delivery address list:
   ph10@myhost.test.ex 
 Delivery address list:
   ph10@myhost.test.ex 

-locking TESTSUITE/spool/db/retry.lockfile
-locked  TESTSUITE/spool/db/retry.lockfile
-EXIM_DBOPEN: file <TESTSUITE/spool/db/retry> dir <TESTSUITE/spool/db> flags=O_RDONLY
-returned from EXIM_DBOPEN: (nil)
-ensuring TESTSUITE/spool/db/retry.lockfile is owned by exim
-failed to open DB file TESTSUITE/spool/db/retry.lockfile: No such file or directory
+ locking TESTSUITE/spool/db/retry.lockfile
+ locked  TESTSUITE/spool/db/retry.lockfile
+ EXIM_DBOPEN: file <TESTSUITE/spool/db/retry> dir <TESTSUITE/spool/db> flags=O_RDONLY
+ returned from EXIM_DBOPEN: (nil)
+ ensuring TESTSUITE/spool/db/retry.lockfile is owned by exim
+ failed to open DB file TESTSUITE/spool/db/retry.lockfile: No such file or directory

 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: ph10@myhost.test.ex
 unique = ph10@myhost.test.ex
 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: ph10@myhost.test.ex
 unique = ph10@myhost.test.ex

-no domain retry record
-no address retry record
+no   domain  retry record
+no   address retry record

 ph10@myhost.test.ex: queued for routing
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing ph10@myhost.test.ex
 --------> r1 router <--------
 local_part=ph10 domain=myhost.test.ex
 processing address_data
 ph10@myhost.test.ex: queued for routing
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing ph10@myhost.test.ex
 --------> r1 router <--------
 local_part=ph10 domain=myhost.test.ex
 processing address_data

-search_open: mysql "NULL"
-search_find: file="NULL"
-  key="select name from them where id='ph10'" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="NULL"
-  type=mysql key="select name from them where id='ph10'"
-database lookup required for select name from them where id='ph10'
-MySQL query: select name from them where id='ph10'
-MYSQL new connection: host=127.0.0.1 port=1223 socket=NULL database=test user=root
-lookup yielded: Philip Hazel
+ search_open: mysql "NULL"
+ search_find: file="NULL"
+   key="select name from them where id='ph10'" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="NULL"
+   type=mysql key="select name from them where id='ph10'"
+ database lookup required for select name from them where id='ph10'
+ MySQL query: select name from them where id='ph10'
+ MYSQL new connection: host=127.0.0.1 port=1223 socket=NULL database=test user=root
+ lookup yielded: Philip Hazel

 calling r1 router
 r1 router called for ph10@myhost.test.ex
   domain = myhost.test.ex
 calling r1 router
 r1 router called for ph10@myhost.test.ex
   domain = myhost.test.ex


@@ -399,11 +399,11 @@ search_tidyup called
 close MYSQL connection: 127.0.0.1:1223/test/root
 >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
 --------> ph10@myhost.test.ex <--------
 close MYSQL connection: 127.0.0.1:1223/test/root
 >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
 --------> ph10@myhost.test.ex <--------

-locking TESTSUITE/spool/db/retry.lockfile
-locked  TESTSUITE/spool/db/retry.lockfile
-EXIM_DBOPEN: file <TESTSUITE/spool/db/retry> dir <TESTSUITE/spool/db> flags=O_RDONLY
-returned from EXIM_DBOPEN: (nil)
-failed to open DB file TESTSUITE/spool/db/retry: No such file or directory
+ locking TESTSUITE/spool/db/retry.lockfile
+ locked  TESTSUITE/spool/db/retry.lockfile
+ EXIM_DBOPEN: file <TESTSUITE/spool/db/retry> dir <TESTSUITE/spool/db> flags=O_RDONLY
+ returned from EXIM_DBOPEN: (nil)
+ failed to open DB file TESTSUITE/spool/db/retry: No such file or directory

 no retry data available
 search_tidyup called
 changed uid/gid: local delivery to ph10 <ph10@myhost.test.ex> transport=t1
 no retry data available
 search_tidyup called
 changed uid/gid: local delivery to ph10 <ph10@myhost.test.ex> transport=t1


@@ -411,16 +411,16 @@ changed uid/gid: local delivery to ph10 <ph10@myhost.test.ex> transport=t1
   home=NULL current=/
 set_process_info: pppp delivering 10HmaX-0005vi-00 to ph10 using t1
 appendfile transport entered
   home=NULL current=/
 set_process_info: pppp delivering 10HmaX-0005vi-00 to ph10 using t1
 appendfile transport entered

-search_open: mysql "NULL"
-search_find: file="NULL"
-  key="select id from them where id='ph10'" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="NULL"
-  type=mysql key="select id from them where id='ph10'"
-database lookup required for select id from them where id='ph10'
-MySQL query: select id from them where id='ph10'
-MYSQL new connection: host=127.0.0.1 port=1223 socket=NULL database=test user=root
-lookup yielded: ph10
+ search_open: mysql "NULL"
+ search_find: file="NULL"
+   key="select id from them where id='ph10'" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="NULL"
+   type=mysql key="select id from them where id='ph10'"
+ database lookup required for select id from them where id='ph10'
+ MySQL query: select id from them where id='ph10'
+ MYSQL new connection: host=127.0.0.1 port=1223 socket=NULL database=test user=root
+ lookup yielded: ph10

 appendfile: mode=600 notify_comsat=0 quota=0 warning=0
   file=TESTSUITE/test-mail/ph10 format=unix
   message_prefix=From ${if def:return_path{$return_path}{MAILER-DAEMON}} ${tod_bsdinbox}\n
 appendfile: mode=600 notify_comsat=0 quota=0 warning=0
   file=TESTSUITE/test-mail/ph10 format=unix
   message_prefix=From ${if def:return_path{$return_path}{MAILER-DAEMON}} ${tod_bsdinbox}\n


@@ -458,7 +458,7 @@ end of retry processing
 DSN: processing router : r1
 DSN: processing successful delivery address: ph10@myhost.test.ex
 DSN: Sender_address: CALLER@myhost.test.ex
 DSN: processing router : r1
 DSN: processing successful delivery address: ph10@myhost.test.ex
 DSN: Sender_address: CALLER@myhost.test.ex

-DSN: orcpt: NULL  flags: 0
+DSN: orcpt: NULL  flags: 0x0

 DSN: envid: NULL  ret: 0
 DSN: Final recipient: ph10@myhost.test.ex
 DSN: Remote SMTP server supports DSN: 0
 DSN: envid: NULL  ret: 0
 DSN: Final recipient: ph10@myhost.test.ex
 DSN: Remote SMTP server supports DSN: 0