MonetDB: int128 - Merge with Jan2014 branch.

[Stefan Manegold]

Changeset: 8347a4eede60 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8347a4eede60
Modified Files:
        configure.ag
        sql/server/rel_schema.c
Branch: int128
Log Message:

Merge with Jan2014 branch.


diffs (48 lines):

diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -2388,9 +2388,20 @@ AM_CONDITIONAL(HAVE_CFITSIO, test x"$hav
 PKG_CHECK_MODULES([atomic_ops], [atomic_ops], [have_atomic_ops="yes"],
        [have_atomic_ops="no"; why_have_atomic_ops="(atomic_ops library not 
found)"])
 if test x"$have_atomic_ops" = x"yes" ; then
-       AC_DEFINE(HAVE_LIBATOMIC_OPS, 1, [Define if you have the libatomic_ops 
library])
-       CFLAGS="$CFLAGS $atomic_ops_CFLAGS"
-       LIBS="$LIBS $atomic_ops_LIBS"
+       case $GCC-$CC in
+       -*icc*)
+               # Even with libatomic_ops available, compilation with
+               # atomic_ops enabled fails with Intel's icc (version 11.1);
+               # hence, we refrain from from using atomic_ops with icc.
+               have_atomic_ops="no"
+               why_have_atomic_ops="(atomic_ops do not compile with Intel's 
icc)"
+               ;;
+       *)
+               AC_DEFINE(HAVE_LIBATOMIC_OPS, 1, [Define if you have the 
libatomic_ops library])
+               CFLAGS="$CFLAGS $atomic_ops_CFLAGS"
+               LIBS="$LIBS $atomic_ops_LIBS"
+               ;;
+       esac
 fi
 
 dnl Check for gsl library for statistical functions
diff --git a/sql/server/rel_schema.c b/sql/server/rel_schema.c
--- a/sql/server/rel_schema.c
+++ b/sql/server/rel_schema.c
@@ -1491,7 +1491,7 @@ rel_revoke_privs(mvc *sql, sql_schema *c
 
 /* iname, itype, sname.tname (col1 .. coln) */
 static sql_rel *
-rel_create_index(mvc *sql, char *iname, int itype, dlist *qname, dlist 
*column_list)
+rel_create_index(mvc *sql, char *iname, idx_type itype, dlist *qname, dlist 
*column_list)
 {
        sql_schema *s = NULL;
        sql_table *t, *nt;
@@ -1723,7 +1723,7 @@ rel_schemas(mvc *sql, symbol *s)
                dlist *l = s->data.lval;
 
                assert(l->h->next->type == type_int);
-               ret = rel_create_index(sql, l->h->data.sval, 
l->h->next->data.i_val, l->h->next->next->data.lval, 
l->h->next->next->next->data.lval);
+               ret = rel_create_index(sql, l->h->data.sval, (idx_type) 
l->h->next->data.i_val, l->h->next->next->data.lval, 
l->h->next->next->next->data.lval);
        }       break;
        case SQL_DROP_INDEX: {
                dlist *l = s->data.lval;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list