MonetDB: default - Merge with Oct2010 branch.

[Sjoerd Mullender]

Changeset: 230b2000088e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=230b2000088e
Modified Files:
        
Branch: default
Log Message:

Merge with Oct2010 branch.


diffs (22 lines):

diff -r 617886a65f23 -r 230b2000088e MonetDB5/src/mal/mal_instruction.mx
--- a/MonetDB5/src/mal/mal_instruction.mx       Mon Sep 06 12:39:41 2010 +0200
+++ b/MonetDB5/src/mal/mal_instruction.mx       Mon Sep 06 14:18:03 2010 +0200
@@ -1659,8 +1659,7 @@
        InstrPtr q;
        int actions;
 
-       vars= (int *) alloca(mb->vtop * sizeof(int));
-       memset((char*) vars, 0, mb->vtop * sizeof(int));
+       vars= (int *) GDKzalloc(mb->vtop * sizeof(int));
 
        /* build the alias table */
        for (i = 0; i < mb->vtop; i++) {
@@ -1714,6 +1713,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