Changeset: 33ff8b4c29a1 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=33ff8b4c29a1
Modified Files:
configure.ag
Branch: default
Log Message:
Merge with Aug2011 branch.
diffs (83 lines):
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -562,6 +562,7 @@
X_CFLAGS="$X_CFLAGS -Wformat=2 -Wno-format-nonliteral"
X_CFLAGS="$X_CFLAGS -Winit-self"
X_CFLAGS="$X_CFLAGS -Winvalid-pch"
+ X_CFLAGS="$X_CFLAGS -Wmissing-format-attribute"
X_CFLAGS="$X_CFLAGS -Wpacked"
X_CFLAGS="$X_CFLAGS -Wunknown-pragmas"
case "$CC-$gcc_ver" in
@@ -629,7 +630,6 @@
dnl X_CFLAGS="$X_CFLAGS -Wfloat-equal"
dnl X_CFLAGS="$X_CFLAGS -Winline"
dnl X_CFLAGS="$X_CFLAGS -Wmissing-declarations"
- dnl X_CFLAGS="$X_CFLAGS -Wmissing-format-attribute"
dnl X_CFLAGS="$X_CFLAGS -Wmissing-noreturn"
dnl X_CFLAGS="$X_CFLAGS -Wmissing-prototypes"
dnl X_CFLAGS="$X_CFLAGS -Wnested-externs"
diff --git a/monetdb5/modules/atoms/mtime.mx b/monetdb5/modules/atoms/mtime.mx
--- a/monetdb5/modules/atoms/mtime.mx
+++ b/monetdb5/modules/atoms/mtime.mx
@@ -458,7 +458,7 @@
comment "Add months to a date";
@-
-#command int(d:date):int = MTIMEdate_2in;
+#command int(d:date):int = MTIMEdate_2int;
#command int(d:daytime):int = MTIMEdaytime_2int;
#command lng(d:timestamp):int = MTIMEtimestamp_2lng;
#command lng(d:timezone):lng = MTIMEtzone_2lng;
diff --git a/monetdb5/modules/kernel/microbenchmark.mx
b/monetdb5/modules/kernel/microbenchmark.mx
--- a/monetdb5/modules/kernel/microbenchmark.mx
+++ b/monetdb5/modules/kernel/microbenchmark.mx
@@ -353,7 +353,7 @@
str
MBMrandom(int *ret, oid *base, int *size, int *domain){
- BAT *bn;
+ BAT *bn = NULL;
BATrandom(&bn, base, size, domain);
if( bn ){
@@ -365,7 +365,7 @@
str
MBMuniform(int *ret, oid *base, int *size, int *domain){
- BAT *bn;
+ BAT *bn = NULL;
BATuniform(&bn, base, size, domain);
if( bn ){
@@ -377,7 +377,7 @@
str
MBMnormal(int *ret, oid *base, int *size, int *domain, int *stddev, int *mean){
- BAT *bn;
+ BAT *bn = NULL;
BATnormal(&bn, base, size, domain, stddev, mean);
if( bn ){
if (!(bn->batDirty&2)) bn = BATsetaccess(bn, BAT_READ);
@@ -419,7 +419,7 @@
str
MBMskewed(int *ret, oid *base, int *size, int *domain, int *skew){
- BAT *bn;
+ BAT *bn = NULL;
BATskewed(&bn, base, size, domain, skew);
if( bn ){
diff --git a/monetdb5/optimizer/opt_multiplex.mx
b/monetdb5/optimizer/opt_multiplex.mx
--- a/monetdb5/optimizer/opt_multiplex.mx
+++ b/monetdb5/optimizer/opt_multiplex.mx
@@ -311,9 +311,6 @@
if (mb->errors){
/* rollback */
}
- if ( mb->errors == 0)
- setLifespan(mb); /* leave a proper initialized life span behind
*/
-
return mb->errors? 0: actions;
}
@include optimizerWrapper.mx
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
