MonetDB: Oct2010 - Merge heads.

[Sjoerd Mullender]

Changeset: 745e883c84c2 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=745e883c84c2
Modified Files:
        
Branch: Oct2010
Log Message:

Merge heads.


diffs (21 lines):

diff -r f1b3fb24d6a5 -r 745e883c84c2 MonetDB5/src/mal/mal_instruction.mx
--- a/MonetDB5/src/mal/mal_instruction.mx       Mon Sep 06 12:38:45 2010 +0200
+++ b/MonetDB5/src/mal/mal_instruction.mx       Mon Sep 06 14:16:56 2010 +0200
@@ -1659,7 +1659,7 @@
        InstrPtr q;
        int actions;
 
-       vars= (int *) alloca(mb->vtop * sizeof(int));
+       vars= (int *) GDKmalloc(mb->vtop * sizeof(int));
        memset((char*) vars, 0, mb->vtop * sizeof(int));
 
        /* build the alias table */
@@ -1714,6 +1714,8 @@
        mnstr_printf(GDKout, "After reduction \n");
        printFunction(GDKout,mb,0,0);
 #endif
+       if (vars)
+               GDKfree(vars);
        mb->vtop = cnt;
 }
 void
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list