Changeset: 43678e81548a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=43678e81548a
Modified Files:
Branch: headless
Log Message:
Merge with default branch.
diffs (174 lines):
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -129,7 +129,7 @@
!IFNDEF LIBICONV
LIBICONV = C:\iconv-1.9.2.win$(bits)
!ENDIF
-ICONV_LIBS = "$(LIBICONV)\lib\iconv$(DEBUGLIB).lib"
+LTLIBICONV = "$(LIBICONV)\lib\iconv$(DEBUGLIB).lib"
ICONV_CFLAGS = -DHAVE_ICONV "-I$(LIBICONV)\include"
!ENDIF
@@ -210,7 +210,7 @@
COMPILERFLAGS = -GF -W3 $(W_CFLAGS) -wd4273 -wd4102 -MD -nologo -Ox
NO_INLINE_CFLAGS = -Od -Ob0gysi-
!ENDIF
-CFLAGS = $(COMPILERFLAGS) -I. -I$(TOPDIR) $(LIBC_INCS) $(INCLUDES)
$(WINCONFIG_INCS)
+CFLAGS = $(COMPILERFLAGS) -I. -I$(TOPDIR) $(LIBC_INCS) $(INCLUDES)
$(WINCONFIG_INCS) $(ICONV_CFLAGS)
# No general LDFLAGS needed
INSTALL = copy
diff --git a/bootstrap b/bootstrap
--- a/bootstrap
+++ b/bootstrap
@@ -52,7 +52,7 @@
sed '1,/^AC_CONFIG_FILES/d' configure.ag
) > configure.ac &&
$libtoolize -c -f &&
-aclocal -I . -I buildtools/conf ${_m4_extra_dirs} &&
+aclocal ${_m4_extra_dirs} &&
autoheader &&
automake --add-missing --copy --foreign &&
autoconf
diff --git a/clients/odbc/driver/Makefile.ag b/clients/odbc/driver/Makefile.ag
--- a/clients/odbc/driver/Makefile.ag
+++ b/clients/odbc/driver/Makefile.ag
@@ -117,6 +117,6 @@
SQLTransact.c \
driver.rc \
ODBC.syms
- LIBS = ../../mapilib/libmapi $(ICONV_LIBS) $(ODBC_LIBS) $(SOCKET_LIBS)
+ LIBS = ../../mapilib/libmapi $(LTLIBICONV) $(ODBC_LIBS) $(SOCKET_LIBS)
}
diff --git a/clients/perl/Cimpl/Makefile.ag b/clients/perl/Cimpl/Makefile.ag
--- a/clients/perl/Cimpl/Makefile.ag
+++ b/clients/perl/Cimpl/Makefile.ag
@@ -15,25 +15,26 @@
# Copyright August 2008-2011 MonetDB B.V.
# All Rights Reserved.
-SWIGFLAGS = -I../../mapilib $(PERL_INCS)
+SWIGFLAGS = -I$(srcdir)/../../mapilib $(PERL_INCS)
INCLUDES = ../../mapilib ../../../common/options $(PERL_INCS)
-# Both GNU's gcc and Intel's icc do not like to compile swig-generated code
-# with our strict X_CFLAGS.
-# Instead of diabling the strict X_CFLAGS completely,
-# we use GCC_SWIG_CFLAGS and ICC_SWIG_CFLAGS, respectively,
-# to disable only the problematic warnings/errors as locally as possbile.
-# See configure.ag for details.
+# Both GNU's gcc and Intel's icc do not like to compile
+# swig-generated code with our strict X_CFLAGS.
+# Instead of disabling the strict X_CFLAGS completely, we use
+# GCC_SWIG_CFLAGS and ICC_SWIG_CFLAGS, respectively, to disable only
+# the problematic warnings/errors as locally as possible. See
+# configure.ag for details.
#CFLAGS = $(GCC_SWIG_CFLAGS) $(ICC_SWIG_CFLAGS) -D_GNU_SOURCE
#
-# However, at least with gcc 4.2.2 and swig 1.3.31 on Gentoo 1.12.9, we still
get
+# However, at least with gcc 4.2.2 and swig 1.3.31 on Gentoo 1.12.9,
+# we still get
# MapiLib.pm.c: In function 'boot_MapiLib':
# MapiLib.pm.c:6157: warning: passing argument 2 of '_swig_create_magic'
discards qualifiers from pointer target type
# Hence, we have to disable (override) our X_CFLAGS completely:
X_CFLAGS = -D_GNU_SOURCE
-# Likewise, we need to disable W_CFLAGS=-WX (i.e., treating warnings as
errors)
-# for swig-generated code on Windows
+# Likewise, we need to disable W_CFLAGS=-WX (i.e., treating warnings
+# as errors) for swig-generated code on Windows
W_CFLAGS =
lib_MapiLib = {
diff --git a/common/stream/Makefile.ag b/common/stream/Makefile.ag
--- a/common/stream/Makefile.ag
+++ b/common/stream/Makefile.ag
@@ -24,8 +24,7 @@
INCLUDES = $(zlib_CFLAGS) \
$(BZ_CFLAGS) \
$(openssl_CFLAGS) \
- $(curl_CFLAGS) \
- $(ICONV_CFLAGS)
+ $(curl_CFLAGS)
lib_stream = {
SOURCES = stream.c stream.h
@@ -35,7 +34,7 @@
$(BZ_LIBS) \
$(openssl_LIBS) \
$(curl_LIBS) \
- $(ICONV_LIBS)
+ $(LTLIBICONV)
}
headers_common = {
diff --git a/monetdb5/optimizer/opt_reorder.mx
b/monetdb5/optimizer/opt_reorder.mx
--- a/monetdb5/optimizer/opt_reorder.mx
+++ b/monetdb5/optimizer/opt_reorder.mx
@@ -103,12 +103,9 @@
}
for ( i=0; i< mb->stop; i++){
- int cnt;
- int slots;
p= getInstrPtr(mb,i);
- slots = 2 * p->argc;
block |= p->barrier != 0;
- list[i]= (Node) GDKzalloc(sizeof(NodeRecord) + sizeof(int) *
slots);
+ list[i]= (Node) GDKzalloc(sizeof(NodeRecord) + sizeof(int) *
p->argc);
if (list[i] == NULL){
for (i--; i>=0; i--)
GDKfree(list[i]);
@@ -116,21 +113,7 @@
GDKfree(var);
return 0;
}
- cnt = p->argc;
- if ( sqlRef == getModuleId(p) && isUpdateInstruction(p)) {
- int storage_read;
- for ( storage_read = 0; i > storage_read;
storage_read++) {
- InstrPtr reading = getInstrPtr(mb,storage_read);
- if ( sqlRef == getModuleId(reading) && bindRef
== getFunctionId(reading)) {
- if ( cnt == slots){
- list[i]=
GDKrealloc(list[i],sizeof(NodeRecord) + sizeof(int) * (slots + 8));
- slots += 8;
- }
- list[i]->stmt[cnt++] = storage_read;
- }
- }
- }
- list[i]->cnt= cnt;
+ list[i]->cnt= p->argc;
for( j=p->retc; j<p->argc; j++)
list[i]->stmt[j]= var[getArg(p,j)];
/* keep the assignment order */
@@ -147,13 +130,6 @@
var[getArg(p,j)]= i;
*/
}
- if ( block ){
- for (i--; i>=0; i--)
- GDKfree(list[i]);
- //GDKfree(list);
- //GDKfree(var);
- return NULL;
- }
@-
mnstr_printf(cntxt->fdout,"DEPENDENCY TABLE\n");
for(i=0;i<mb->stop; i++)
@@ -164,6 +140,13 @@
mnstr_printf(cntxt->fdout,"\n");
}
@c
+ if ( block ){
+ for (i--; i>=0; i--)
+ GDKfree(list[i]);
+ GDKfree(list);
+ GDKfree(var);
+ return NULL;
+ }
GDKfree(var);
return list;
}
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
