*** /home/nmisch/src/cvs/postgresql/src/test/regress/expected/xml.out	2011-06-20 00:51:56.000000000 -0400
--- /home/nmisch/src/cvs/postgresql/src/test/regress/results/xml.out	2011-06-20 01:19:20.000000000 -0400
***************
*** 223,234 ****
--- 223,240 ----
  <undefinedentity>&idontexist;</undefinedentity>
                                                 ^
  SELECT xmlparse(content '<invalidns xmlns=''&lt;''/>');
+ WARNING:  line 1: xmlns: < not a valid URI
+ <invalidns xmlns='&lt;'/>
+                        ^
           xmlparse          
  ---------------------------
   <invalidns xmlns='&lt;'/>
  (1 row)
  
  SELECT xmlparse(content '<relativens xmlns=''relative''/>');
+ WARNING:  line 1: xmlns: URI relative is not absolute
+ <relativens xmlns='relative'/>
+                             ^
              xmlparse            
  --------------------------------
   <relativens xmlns='relative'/>
***************
*** 279,290 ****
--- 285,302 ----
  <undefinedentity>&idontexist;</abc>
                                     ^
  SELECT xmlparse(document '<invalidns xmlns=''&lt;''/>');
+ WARNING:  line 1: xmlns: < not a valid URI
+ <invalidns xmlns='&lt;'/>
+                        ^
           xmlparse          
  ---------------------------
   <invalidns xmlns='&lt;'/>
  (1 row)
  
  SELECT xmlparse(document '<relativens xmlns=''relative''/>');
+ WARNING:  line 1: xmlns: URI relative is not absolute
+ <relativens xmlns='relative'/>
+                             ^
              xmlparse            
  --------------------------------
   <relativens xmlns='relative'/>
***************
*** 779,790 ****
--- 791,808 ----
  (1 row)
  
  SELECT xml_is_well_formed('<invalidns xmlns=''&lt;''/>');
+ WARNING:  line 1: xmlns: < not a valid URI
+ <invalidns xmlns='&lt;'/>
+                        ^
   xml_is_well_formed 
  --------------------
   t
  (1 row)
  
  SELECT xml_is_well_formed('<relativens xmlns=''relative''/>');
+ WARNING:  line 1: xmlns: URI relative is not absolute
+ <relativens xmlns='relative'/>
+                             ^
   xml_is_well_formed 
  --------------------
   t
***************
*** 812,822 ****
  -- which is invalid beecause '<' may not appear un-escaped in
  -- attribute values.
  SELECT xpath('/*', '<invalidns xmlns=''&lt;''/>');
! ERROR:  could not parse XML document
! DETAIL:  xmlns: '<' is not a valid URI
  <invalidns xmlns='&lt;'/>
                         ^
  CONTEXT:  SQL function "xpath" statement 1
  -- Again, the XML isn't well-formed for namespace purposes
  SELECT xpath('/*', '<nosuchprefix:tag/>');
  ERROR:  could not parse XML document
--- 830,849 ----
  -- which is invalid beecause '<' may not appear un-escaped in
  -- attribute values.
  SELECT xpath('/*', '<invalidns xmlns=''&lt;''/>');
! WARNING:  line 1: xmlns: < not a valid URI
! <invalidns xmlns='&lt;'/>
!                        ^
! LINE 1: SELECT xpath('/*', '<invalidns xmlns=''&lt;''/>');
!                            ^
! WARNING:  line 1: xmlns: < not a valid URI
  <invalidns xmlns='&lt;'/>
                         ^
  CONTEXT:  SQL function "xpath" statement 1
+             xpath             
+ ------------------------------
+  {"<invalidns xmlns=\"<\"/>"}
+ (1 row)
+ 
  -- Again, the XML isn't well-formed for namespace purposes
  SELECT xpath('/*', '<nosuchprefix:tag/>');
  ERROR:  could not parse XML document
***************
*** 827,833 ****
  -- XPath deprecates relative namespaces, but they're not supposed to
  -- thrown an error, only a warning.
  SELECT xpath('/*', '<relativens xmlns=''relative''/>');
! WARNING:  xmlns: URI relative is not absolute
  <relativens xmlns='relative'/>
                              ^
  CONTEXT:  SQL function "xpath" statement 1
--- 854,865 ----
  -- XPath deprecates relative namespaces, but they're not supposed to
  -- thrown an error, only a warning.
  SELECT xpath('/*', '<relativens xmlns=''relative''/>');
! WARNING:  line 1: xmlns: URI relative is not absolute
! <relativens xmlns='relative'/>
!                             ^
! LINE 1: SELECT xpath('/*', '<relativens xmlns=''relative''/>');
!                            ^
! WARNING:  line 1: xmlns: URI relative is not absolute
  <relativens xmlns='relative'/>
                              ^
  CONTEXT:  SQL function "xpath" statement 1

======================================================================