Changeset: 0c846f436c88 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0c846f436c88
Modified Files:
Branch: default
Log Message:
Merge with Apr2011
diffs (240 lines):
diff --git a/clients/mapilib/mapi.c b/clients/mapilib/mapi.c
--- a/clients/mapilib/mapi.c
+++ b/clients/mapilib/mapi.c
@@ -795,6 +795,9 @@
# include <netdb.h>
# include <netinet/in.h>
#endif
+#ifdef HAVE_SYS_UIO_H
+# include <sys/uio.h>
+#endif
#ifdef HAVE_MALLOC_H
#include <malloc.h>
diff --git a/common/utils/mutils.c b/common/utils/mutils.c
--- a/common/utils/mutils.c
+++ b/common/utils/mutils.c
@@ -36,12 +36,12 @@
# include <mach-o/dyld.h> /* _NSGetExecutablePath on OSX >=10.5 */
#endif
-#ifdef HAVE_SYS_PARAM_H
-# include <sys/param.h> /* realpath on OSX */
+#ifdef HAVE_LIMITS_H
+# include <limits.h> /* PATH_MAX on Solaris */
#endif
-#ifdef HAVE_LIMITS_H
-# include <limits.h> /* PATH_MAX on Solaris */
+#ifdef HAVE_SYS_PARAM_H
+# include <sys/param.h> /* realpath on OSX, prerequisite of sys/sysctl on
OpenBSD */
#endif
#ifdef HAVE_SYS_SYSCTL_H
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -1815,16 +1815,14 @@
fi
;;
*)
- req_java_ver_min=1.5 # >= $req_java_ver_min required
- req_java_ver_max=1.6 # < $req_java_ver_max required
- if test MONETDB_VERSION_TO_NUMBER(echo $JAVA_VERSION) -ge
MONETDB_VERSION_TO_NUMBER(echo "$req_java_ver_min") -a
MONETDB_VERSION_TO_NUMBER(echo $JAVA_VERSION) -lt
MONETDB_VERSION_TO_NUMBER(echo "$req_java_ver_max"); then
+ if test MONETDB_VERSION_TO_NUMBER(echo $JAVA_VERSION) =
MONETDB_VERSION_TO_NUMBER(echo "1.5") ; then
have_java_jdbc=yes
else
if test "x$enable_jdbc" = xyes; then
- AC_MSG_ERROR([MonetDB JDBC requires ant and Java >=
$req_java_ver_min, but < $req_java_ver_max.])
+ AC_MSG_ERROR([MonetDB JDBC requires ant and Java 1.5])
else
enable_jdbc=no
- disable_jdbc="(MonetDB JDBC currently requires Java >=
$req_java_ver_min, but < $req_java_ver_max to build)"
+ disable_jdbc="(MonetDB JDBC currently requires Java 1.5
to build)"
fi
fi
;;
@@ -2051,6 +2049,10 @@
AC_SUBST(PTHREAD_LIBS)
AC_SUBST(PTHREAD_INCS)
+C_LIBS=""
+AC_CHECK_LIB(c, sysctlbyname, [ C_LIBS="-lc" ] )
+AC_SUBST(C_LIBS)
+
dnl libreadline
have_readline=auto
READLINE_LIBS=""
@@ -2498,10 +2500,10 @@
sys/param.h \
sys/resource.h \
sys/socket.h \
- sys/sysctl.h \
sys/time.h \
sys/times.h \
sys/types.h \
+ sys/uio.h \
sys/un.h \
sys/utime.h \
sys/wait.h \
@@ -2514,6 +2516,15 @@
xmmintrin.h \
])
+dnl on OpenBSD, sys/sysctl.h requires sys/param.h to be included beforehand
+AC_CHECK_HEADERS([sys/sysctl.h], [], [],
+[
+ #ifdef HAVE_SYS_PARAM_H
+ # include <sys/param.h>
+ #endif
+])
+
+
SOCKET_LIBS=""
have_setsockopt=no
@@ -2541,8 +2552,6 @@
AC_CHECK_LIB(socket, setsockopt, [ SOCKET_LIBS="-lsocket
$SOCKET_LIBS"; have_setsockopt=yes; ]))
fi
-AC_CHECK_HEADERS([sys/socket.h winsock.h])
-
have_getaddrinfo=no
save_LIBS="$LIBS"
LIBS="$LIBS $SOCKET_LIBS"
diff --git a/gdk/Makefile.ag b/gdk/Makefile.ag
--- a/gdk/Makefile.ag
+++ b/gdk/Makefile.ag
@@ -50,5 +50,5 @@
../common/stream/libstream \
../common/utils/libmutils \
$(SOCKET_LIBS) $(zlib_LIBS) $(BZ_LIBS) \
- $(MALLOC_LIBS) $(PTHREAD_LIBS) $(DL_LIBS)
+ $(MALLOC_LIBS) $(PTHREAD_LIBS) $(DL_LIBS) $(C_LIBS)
}
diff --git a/gdk/gdk_system.mx b/gdk/gdk_system.mx
--- a/gdk/gdk_system.mx
+++ b/gdk/gdk_system.mx
@@ -75,6 +75,9 @@
# include <semaphore.h>
#endif
+#ifdef HAVE_SYS_PARAM_H
+# include <sys/param.h> /* prerequisite of sys/sysctl on OpenBSD */
+#endif
#ifdef HAVE_SYS_SYSCTL_H
# include <sys/sysctl.h>
#endif
diff --git a/gdk/gdk_utils.mx b/gdk/gdk_utils.mx
--- a/gdk/gdk_utils.mx
+++ b/gdk/gdk_utils.mx
@@ -58,6 +58,9 @@
# include <pwd.h>
#endif
+#ifdef HAVE_SYS_PARAM_H
+# include <sys/param.h> /* prerequisite of sys/sysctl on OpenBSD */
+#endif
#ifdef HAVE_SYS_SYSCTL_H
# include <sys/sysctl.h>
#endif
diff --git a/java/tests/Test_Rtimedate.java b/java/tests/Test_Rtimedate.java
--- a/java/tests/Test_Rtimedate.java
+++ b/java/tests/Test_Rtimedate.java
@@ -81,6 +81,12 @@
System.out.println("8. " + rs.getString("id") + ", " +
rs.getString("vc") + ", " + rs.getTime("vc"));
// date -> date should be fine
System.out.println("9. " + rs.getString("id") + ", " +
rs.getString("vc") + ", " + rs.getDate("vc"));
+
+ SQLWarning w = con.getWarnings();
+ while (w != null) {
+ System.out.println("warning: " + w.toString());
+ w = w.getNextWarning();
+ }
} catch (SQLException e) {
System.out.println("failed :( "+ e.getMessage());
System.out.println("ABORTING TEST!!!");
diff --git a/java/tests/build.xml b/java/tests/build.xml
--- a/java/tests/build.xml
+++ b/java/tests/build.xml
@@ -54,6 +54,8 @@
<javac
srcdir="${srcdir}"
destdir="${builddir}"
+ debug="true"
+ optimize="false"
target="${javac_version}"
source="${javac_version}"
>
diff --git a/monetdb5/modules/mal/mal_mapi.mx b/monetdb5/modules/mal/mal_mapi.mx
--- a/monetdb5/modules/mal/mal_mapi.mx
+++ b/monetdb5/modules/mal/mal_mapi.mx
@@ -356,6 +356,9 @@
# include <netdb.h>
# include <netinet/in.h>
#endif
+#ifdef HAVE_SYS_UIO_H
+# include <sys/uio.h>
+#endif
#define SOCKPTR struct sockaddr *
#ifdef HAVE_SOCKLEN_T
diff --git a/tools/merovingian/client/Makefile.ag
b/tools/merovingian/client/Makefile.ag
--- a/tools/merovingian/client/Makefile.ag
+++ b/tools/merovingian/client/Makefile.ag
@@ -36,5 +36,6 @@
$(UUID_LIBS) \
$(curl_LIBS) \
$(SOCKET_LIBS) \
- $(MALLOC_LIBS)
+ $(MALLOC_LIBS) \
+ $(C_LIBS)
}
diff --git a/tools/merovingian/daemon/Makefile.ag
b/tools/merovingian/daemon/Makefile.ag
--- a/tools/merovingian/daemon/Makefile.ag
+++ b/tools/merovingian/daemon/Makefile.ag
@@ -69,5 +69,6 @@
$(curl_LIBS) \
$(SOCKET_LIBS) \
$(MALLOC_LIBS) \
- $(PTHREAD_LIBS)
+ $(PTHREAD_LIBS) \
+ $(C_LIBS)
}
diff --git a/tools/merovingian/daemon/client.c
b/tools/merovingian/daemon/client.c
--- a/tools/merovingian/daemon/client.c
+++ b/tools/merovingian/daemon/client.c
@@ -27,6 +27,9 @@
#include <sys/un.h>
#include <netdb.h>
#include <netinet/in.h>
+#ifdef HAVE_SYS_UIO_H
+# include <sys/uio.h>
+#endif
#include <msabaoth.h>
#include <stream.h>
diff --git a/tools/merovingian/daemon/merovingian.h
b/tools/merovingian/daemon/merovingian.h
--- a/tools/merovingian/daemon/merovingian.h
+++ b/tools/merovingian/daemon/merovingian.h
@@ -23,6 +23,7 @@
#include "monetdb_config.h"
#include <stdio.h>
#include <netinet/in.h> /* struct sockaddr_in */
+#include <pthread.h> /* pthread_mutex_t */
#include "utils/utils.h" /* confkeyval */
diff --git a/tools/merovingian/daemon/proxy.c b/tools/merovingian/daemon/proxy.c
--- a/tools/merovingian/daemon/proxy.c
+++ b/tools/merovingian/daemon/proxy.c
@@ -29,6 +29,9 @@
#include <fcntl.h>
#include <string.h> /* strerror */
#include <pthread.h>
+#ifdef HAVE_SYS_UIO_H
+# include <sys/uio.h>
+#endif
#include <stream.h>
#include <stream_socket.h>
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
