Update of /cvsroot/monetdb/pathfinder/compiler/mil
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv25883/mil

Modified Files:
      Tag: XQuery_0-24
        milgen.brg 
Log Message:
-- Fix serialization of mixed result sequences containing boolean values.
   (Thanks to Stefan Klinger for detecting the problem.)


U milgen.brg
Index: milgen.brg
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/mil/milgen.brg,v
retrieving revision 1.157.2.17
retrieving revision 1.157.2.18
diff -u -d -r1.157.2.17 -r1.157.2.18
--- milgen.brg  16 Jun 2008 14:44:45 -0000      1.157.2.17
+++ milgen.brg  17 Jun 2008 15:43:46 -0000      1.157.2.18
@@ -3362,22 +3362,22 @@
                         sorted = true;
                     }
                     else {
+                        mvar_t *v = new_var (1);
                         execute (
+                            assgn (
+                                var (v->name),
+                                select2 (VAR (L(p)->env, pa_item, aat_bln),
+                                         cast (type (mty_bit), nil ()),
+                                         cast (type (mty_bit), nil ()))),
                             binsert (
                                 var (item->name),
-                                mcast (type (mty_oid),
-                                       VAR (L(p)->env, pa_item, aat_bln))),
+                                mcast (type (mty_oid), var (v->name))),
                             binsert (
                                 var (kind->name),
-                                project (select2 (VAR (L(p)->env,
-                                                       pa_item,
-                                                       aat_bln),
-                                                  cast (type (mty_bit),
-                                                        nil ()),
-                                                  cast (type (mty_bit),
-                                                        nil ())),
+                                project (var (v->name),
                                          var (PF_MIL_VAR_BOOL)))
                         );
+                        unpin (v, 1);
                     }
                 }
 


-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins

Reply via email to