Update of /cvsroot/monetdb/pathfinder/runtime/Tests
In directory 
sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv19086/runtime/Tests

Modified Files:
      Tag: M5XQ
        merged_union2.stable.out 
Log Message:
propagated changes of Wednesday Feb 03 2010
from the XQFT branch to the M5XQ branch

  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  2010/02/03 - sjoerd: runtime/Tests/merged_union2.stable.out,1.7.2.1
  propagated changes of Wednesday Feb 03 2010
  from the development trunk to the XQFT branch
  
    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    2010/02/03 - sjoerd: runtime/Tests/merged_union2.stable.out,1.8
    propagated changes of Tuesday Feb 02 2010 - Wednesday Feb 03 2010
    from the Feb2010 branch to the development trunk
  
      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
      2010/02/02 - stmane: runtime/Tests/merged_union2.stable.out,1.7.4.1
  
      updated stable output:
      a typo in an error message had been fixed
      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~


Index: merged_union2.stable.out
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/runtime/Tests/merged_union2.stable.out,v
retrieving revision 1.6.20.1
retrieving revision 1.6.20.2
diff -u -d -r1.6.20.1 -r1.6.20.2
--- merged_union2.stable.out    15 Oct 2009 14:03:02 -0000      1.6.20.1
+++ merged_union2.stable.out    3 Feb 2010 11:44:32 -0000       1.6.20.2
@@ -922,7 +922,7 @@
 z1.insert(8...@0,9...@0);
 
 res_mu := merged_union (z1, a2); # fst not sorted
-!ERROR: merged_union: tail of first BAT/column of table 1 must be 
(resvers-)sorted.
+!ERROR: merged_union: tail of first BAT/column of table 1 must be 
(reverse-)sorted.
 !ERROR: CMDmerged_union: operation failed.
 res_mu := merged_union (a2, z1); # snd not sorted
 !ERROR: merged_union: tail of first BAT/column of table 2 must be sorted.


------------------------------------------------------------------------------
The Planet: dedicated and managed hosting, cloud storage, colocation
Stay online with enterprise data centers and the best network in the business
Choose flexible plans and management services without long-term contracts
Personal 24x7 support from experience hosting pros just a phone call away.
http://p.sf.net/sfu/theplanet-com
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins

Reply via email to