MonetDB: Jun2010 - merge

[Niels Nes]

Changeset: 0f167a02bdeb for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0f167a02bdeb
Modified Files:
        
Branch: Jun2010
Log Message:

merge


diffs (14 lines):

diff -r 0509ca6d5d33 -r 0f167a02bdeb MonetDB5/src/optimizer/opt_reorder.mx
--- a/MonetDB5/src/optimizer/opt_reorder.mx     Thu Jul 29 08:55:02 2010 +0200
+++ b/MonetDB5/src/optimizer/opt_reorder.mx     Thu Jul 29 12:47:41 2010 +0200
@@ -102,8 +102,8 @@
        }
 
        for ( i=0; i< mb->stop; i++){
-               size_t cnt;
-               size_t slots;
+               int cnt;
+               int slots;
                p= getInstrPtr(mb,i);
                slots = 2 * p->argc;
                block |= p->barrier != 0;
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list