Unbreak transport-filters & bounce-generation.

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

diff --git a/test/stderr/9200 b/test/stderr/9200
index 55143b46c69590b4022249d8da4780c223444668..2fff471a35eb502fa20c50885649b6f7ee168159 100644 (file)
--- a/test/stderr/9200
+++ b/test/stderr/9200
@@ -8,7 +8,7 @@ LRU list:
 internal_search_find: file="NULL"
   type=pgsql key="select name from them where id='CALLER';"
 database lookup required for select name from them where id='CALLER';
-PGSQL query: select name from them where id='CALLER';
+PostgreSQL query: select name from them where id='CALLER';
 PGSQL new connection: host=localhost port= database=test user=CALLER
 lookup yielded: Philip Hazel
 search_open: pgsql "NULL"
@@ -28,7 +28,7 @@ LRU list:
 internal_search_find: file="NULL"
   type=pgsql key="select name from them where id='xxxx';"
 database lookup required for select name from them where id='xxxx';
-PGSQL query: select name from them where id='xxxx';
+PostgreSQL query: select name from them where id='xxxx';
 PGSQL using cached connection for localhost/test/CALLER
 PGSQL: no data found
 lookup failed
@@ -40,7 +40,7 @@ LRU list:
 internal_search_find: file="NULL"
   type=pgsql key="select name from them where id='nothing';"
 database lookup required for select name from them where id='nothing';
-PGSQL query: select name from them where id='nothing';
+PostgreSQL query: select name from them where id='nothing';
 PGSQL using cached connection for localhost/test/CALLER
 lookup yielded: 
 search_open: pgsql "NULL"
@@ -51,7 +51,7 @@ LRU list:
 internal_search_find: file="NULL"
   type=pgsql key="select id,name from them where id='nothing';"
 database lookup required for select id,name from them where id='nothing';
-PGSQL query: select id,name from them where id='nothing';
+PostgreSQL query: select id,name from them where id='nothing';
 PGSQL using cached connection for localhost/test/CALLER
 lookup yielded: id=nothing name="" 
 search_open: pgsql "NULL"
@@ -62,7 +62,7 @@ LRU list:
 internal_search_find: file="NULL"
   type=pgsql key="delete from them where id='nonexist';"
 database lookup required for delete from them where id='nonexist';
-PGSQL query: delete from them where id='nonexist';
+PostgreSQL query: delete from them where id='nonexist';
 PGSQL using cached connection for localhost/test/CALLER
 PGSQL: command does not return any data but was successful. Rows affected: 0
 lookup forced cache cleanup
@@ -75,7 +75,7 @@ LRU list:
 internal_search_find: file="NULL"
   type=pgsql key="select * from them where id='quote2';"
 database lookup required for select * from them where id='quote2';
-PGSQL query: select * from them where id='quote2';
+PostgreSQL query: select * from them where id='quote2';
 PGSQL using cached connection for localhost/test/CALLER
 lookup yielded: name="\"stquot" id=quote2 
 search_open: pgsql "NULL"
@@ -86,7 +86,7 @@ LRU list:
 internal_search_find: file="NULL"
   type=pgsql key="select * from them where id='newline';"
 database lookup required for select * from them where id='newline';
-PGSQL query: select * from them where id='newline';
+PostgreSQL query: select * from them where id='newline';
 PGSQL using cached connection for localhost/test/CALLER
 lookup yielded: name="before
 after" id=newline 
@@ -98,7 +98,7 @@ LRU list:
 internal_search_find: file="NULL"
   type=pgsql key="select * from them where id='tab';"
 database lookup required for select * from them where id='tab';
-PGSQL query: select * from them where id='tab';
+PostgreSQL query: select * from them where id='tab';
 PGSQL using cached connection for localhost/test/CALLER
 lookup yielded: name="x        x" id=tab 
 search_open: pgsql "NULL"
@@ -109,10 +109,54 @@ LRU list:
 internal_search_find: file="NULL"
   type=pgsql key="select * from them where name='''stquot';"
 database lookup required for select * from them where name='''stquot';
-PGSQL query: select * from them where name='''stquot';
+PostgreSQL query: select * from them where name='''stquot';
 PGSQL using cached connection for localhost/test/CALLER
 lookup yielded: name='stquot id=quote1 
+search_open: pgsql "NULL"
+  cached open
+search_find: file="NULL"
+  key="servers=x:localhost; select name from them where id='CALLER';" partial=-1 affix=NULL starflags=0
+LRU list:
+internal_search_find: file="NULL"
+  type=pgsql key="servers=x:localhost; select name from them where id='CALLER';"
+database lookup required for servers=x:localhost; select name from them where id='CALLER';
+PostgreSQL query: servers=x:localhost; select name from them where id='CALLER';
+lookup deferred: PostgreSQL server "x" not found in pgsql_servers
+search_open: pgsql "NULL"
+  cached open
+search_find: file="NULL"
+  key="servers=localhost:x; select name from them where id='CALLER';" partial=-1 affix=NULL starflags=0
+LRU list:
+internal_search_find: file="NULL"
+  type=pgsql key="servers=localhost:x; select name from them where id='CALLER';"
+database lookup required for servers=localhost:x; select name from them where id='CALLER';
+PostgreSQL query: servers=localhost:x; select name from them where id='CALLER';
+PGSQL using cached connection for localhost/test/CALLER
+lookup yielded: Philip Hazel
+search_open: pgsql "NULL"
+  cached open
+search_find: file="NULL"
+  key="servers=localhost/test/CALLER/:x; select name from them where id='CALLER';" partial=-1 affix=NULL starflags=0
+LRU list:
+internal_search_find: file="NULL"
+  type=pgsql key="servers=localhost/test/CALLER/:x; select name from them where id='CALLER';"
+database lookup required for servers=localhost/test/CALLER/:x; select name from them where id='CALLER';
+PostgreSQL query: servers=localhost/test/CALLER/:x; select name from them where id='CALLER';
+PGSQL using cached connection for localhost/test/CALLER
+lookup yielded: Philip Hazel
+search_open: pgsql "NULL"
+  cached open
+search_find: file="NULL"
+  key="servers=(/tmp/.s.PGSQL.5432)/test/CALLER/:x; select name from them where id='CALLER';" partial=-1 affix=NULL starflags=0
+LRU list:
+internal_search_find: file="NULL"
+  type=pgsql key="servers=(/tmp/.s.PGSQL.5432)/test/CALLER/:x; select name from them where id='CALLER';"
+database lookup required for servers=(/tmp/.s.PGSQL.5432)/test/CALLER/:x; select name from them where id='CALLER';
+PostgreSQL query: servers=(/tmp/.s.PGSQL.5432)/test/CALLER/:x; select name from them where id='CALLER';
+PGSQL new connection: socket=/tmp/.s.PGSQL.5432 database=test user=CALLER
+lookup yielded: Philip Hazel
 search_tidyup called
+close PGSQL connection: (/tmp/.s.PGSQL.5432)/test/CALLER
 close PGSQL connection: localhost/test/CALLER
 >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
@@ -159,7 +203,7 @@ LRU list:
 internal_search_find: file="NULL"
   type=pgsql key="select * from them where id='10.0.0.0'"
 database lookup required for select * from them where id='10.0.0.0'
-PGSQL query: select * from them where id='10.0.0.0'
+PostgreSQL query: select * from them where id='10.0.0.0'
 PGSQL new connection: host=localhost port= database=test user=CALLER
 PGSQL: no data found
 lookup failed
@@ -290,7 +334,7 @@ LRU list:
 internal_search_find: file="NULL"
   type=pgsql key="select name from them where id='CALLER'"
 database lookup required for select name from them where id='CALLER'
-PGSQL query: select name from them where id='CALLER'
+PostgreSQL query: select name from them where id='CALLER'
 PGSQL new connection: host=localhost port= database=test user=CALLER
 lookup yielded: Philip Hazel
 calling r1 router
@@ -333,7 +377,7 @@ LRU list:
 internal_search_find: file="NULL"
   type=pgsql key="select id from them where id='CALLER'"
 database lookup required for select id from them where id='CALLER'
-PGSQL query: select id from them where id='CALLER'
+PostgreSQL query: select id from them where id='CALLER'
 PGSQL new connection: host=localhost port= database=test user=CALLER
 lookup yielded: CALLER
 appendfile: mode=600 notify_comsat=0 quota=0 warning=0
@@ -387,7 +431,7 @@ LRU list:
 internal_search_find: file="NULL"
   type=pgsql key="select name from them where id='CALLER';"
 database lookup required for select name from them where id='CALLER';
-PGSQL query: select name from them where id='CALLER';
+PostgreSQL query: select name from them where id='CALLER';
 PGSQL new connection: socket=/tmp/.s.PGSQL.5432 database=test user=CALLER
 lookup yielded: Philip Hazel
 search_tidyup called