MonetDB: default - fixed problem with slice and packed flag

[Niels Nes]

Changeset: a62747757b50 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a62747757b50
Modified Files:
        monetdb5/optimizer/opt_mergetable.c
        
sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out
Branch: default
Log Message:

fixed problem with slice and packed flag


diffs (31 lines):

diff --git a/monetdb5/optimizer/opt_mergetable.c 
b/monetdb5/optimizer/opt_mergetable.c
--- a/monetdb5/optimizer/opt_mergetable.c
+++ b/monetdb5/optimizer/opt_mergetable.c
@@ -1444,14 +1444,12 @@ mat_topn(MalBlkPtr mb, InstrPtr p, matli
                        pushInstruction(mb,r);
 
                        q = copyInstruction(p);
-                       //setFunctionId(q, subsliceRef);
-                       setFunctionId(q, sliceRef);
+                       setFunctionId(q, subsliceRef);
                        if (ml->v[m].type != mat_tpn || is_slice) 
                                getArg(q,1) = getArg(r,0);
                        pushInstruction(mb,q);
                }
 
-               ml->v[piv].packed = 1;
                ml->v[piv].type = mat_slc;
        }
 }
diff --git 
a/sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out
 
b/sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out
--- 
a/sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out
+++ 
b/sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out
@@ -22,7 +22,7 @@ Ready.
 
 #debug select * from tables;
 mdb>#X_1=0@0:void := user.s1_1();
-mdb>#X_159=0@0:void := querylog.define("debug select * from 
tables;","default_pipe",375);
+mdb>#X_164=0@0:void := querylog.define("debug select * from 
tables;","default_pipe",352);
 
 # 16:24:01 >  
 # 16:24:01 >  "Done."
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list