MonetDB: sciql - merge with default

[Jennie Zhang]

Changeset: 88c0284c77df for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=88c0284c77df
Modified Files:
        
Branch: sciql
Log Message:

merge with default


diffs (24 lines):

diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -1038,7 +1038,7 @@
                       fi
                       case "$gcc_ver" in
                       4.*)
-                                                 CFLAGS="$CFLAGS -O6 
-fomit-frame-pointer -finline-functions -malign-loops=4 -malign-jumps=4 
-malign-functions=4 -fexpensive-optimizations -funroll-all-loops  
-funroll-loops -frerun-cse-after-loop -frerun-loop-opt -ftree-vectorize";;
+                                                 CFLAGS="$CFLAGS -O6 
-fomit-frame-pointer -finline-functions -fexpensive-optimizations 
-funroll-all-loops -funroll-loops -frerun-cse-after-loop -frerun-loop-opt 
-ftree-vectorize";;
                                          *)
                                                  CFLAGS="$CFLAGS -O2 
-fomit-frame-pointer -finline-functions";;
                       esac
diff --git a/gdk/gdk_setop.mx b/gdk/gdk_setop.mx
--- a/gdk/gdk_setop.mx
+++ b/gdk/gdk_setop.mx
@@ -326,7 +326,7 @@
                        BAT *tmp2 = NULL, *tmp1, *tmp0 = VIEWhead_(b, 
BAT_WRITE);
 
                        if (tmp0) {
-                               tmp1 = BATsample(b, 1000);
+                               tmp1 = BATsample(tmp0, 1000);
                                if (tmp1) {
                                        tmp2 = BATkunique(tmp1);
                                        if (tmp2) {
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list