Changeset: 535a311fd3ae for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=535a311fd3ae
Modified Files:
monetdb5/VERSION
Branch: sciql
Log Message:
Merge with default branch.
diffs (truncated from 864 to 300 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -528,18 +528,19 @@
%build
%{configure} \
- --enable-strict=no \
- --enable-assert=no \
- --enable-debug=no \
- --enable-optimize=yes \
- --enable-bits=%{bits} \
- --enable-java=no \
+ --enable-strict=no \
+ --enable-assert=no \
+ --enable-debug=no \
+ --enable-optimize=yes \
+ --enable-bits=%{bits} \
+ --enable-jdbc=no \
+ --enable-merocontrol=no \
--enable-rdf=no \
--enable-fits=no \
--with-valgrind=no \
--with-mseed=no \
- %{?oid32:--enable-oid32} \
- %{?comp_cc:CC="%{comp_cc}"} \
+ %{?oid32:--enable-oid32} \
+ %{?comp_cc:CC="%{comp_cc}"} \
%{?_with_netcdf} %{?_without_netcdf}
make
diff --git a/clients/mapiclient/mclient.1 b/clients/mapiclient/mclient.1
--- a/clients/mapiclient/mclient.1
+++ b/clients/mapiclient/mclient.1
@@ -6,8 +6,10 @@
[
.I options
] [
+.I file or database
+[
.I file
-\&... ]
+\&... ] ]
.br
.B mclient
.B \-\-help
@@ -24,7 +26,7 @@
.BI \-\-statement= query
.RB ( \-s
.IR query)
-option is given, the query is executed.
+option is given, the query is executed as if it were given in a file.
If any files are listed after the options, queries are read from the
files and executed.
In either case,
@@ -66,20 +68,20 @@
.I .monetdb
file. If the environment variable
.B DOTMONETDBFILE
-is set, it reads the file pointed to by that variable. When unset,
+is set, it reads the file pointed to by that variable instead. When unset,
.I mclient
searches for a
.I .monetdb
file in the current working directory, and if that doesn't exist, in the
current user's home directory. This file can contain defaults for the
flags
-.BR user ", " password " and " language .
+.BR user ", " password ", " language ", " save_history ", " format " and "
width .
For example, an entry in a
.I .monetdb
file that sets the default language for
.I mclient
-to sql looks like this:
-.IR "language=sql" .
+to mal looks like this:
+.IR "language=mal" .
To disable reading the
.I .monetdb
file, set the variable
@@ -107,11 +109,16 @@
option, give language-specific help and continue.
.TP
\fB\-\-database=\fP\fIdatabase\fP (\fB\-d\fP \fIdatabase\fP)
-Specify the name of the database to connect to.
+Specify the name of the database to connect to. The \fB-d\fP can be
+omitted if an equally named file does not exist in the current
+directory. As such, the first non-option argument will be interpreted
+as database to connect to if the argument does not exist as file.
.TP
\fB\-\-host=\fP\fIhostname\fP (\fB\-h\fP \fIhostname\fP)
Specify the name of the host on which the server runs (default:
-localhost).
+localhost). When the argument starts with a forward slash (/), host is
+assumed to be the directory where the UNIX sockets are stored for
+platforms where these are supported.
.TP
\fB\-\-port=\fP\fIportnr\fP (\fB\-p\fP \fIportnr\fP)
Specify the portnumber of the server (default: 50000).
@@ -120,11 +127,13 @@
After executing the queries from the
.B \-\-statement
option and any file specified on the command
-line, read queries from standard input.
+line, read queries from standard input. When this option is set, all
+files are read line by line, like if it were entered on mclient's
+console.
.TP
\fB\-\-user\fP\fB=\fP\fIuser\fP (\fB\-u\fP \fIuser\fP)
Specify the user to connect as. If this flag is absent, the client will
-ask for a user name. Note that
+ask for a user name, unless a default was found in .monetdb file. Note that
.I user
must follow immediately after the option.
.TP
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -236,35 +236,23 @@
AC_DEFINE([HAVE_CONSOLE], 1, [If the console should be used])
fi
-AC_ARG_ENABLE(java,
- AS_HELP_STRING([--enable-java], [(try to) build Java components]),
- enable_java="$enableval",
- enable_java=auto)
+AC_ARG_ENABLE(jdbc,
+ AS_HELP_STRING([--enable-jdbc], [build the MonetDB JDBC driver]),
+ enable_jdbc="$enableval",
+ enable_jdbc=auto)
+case $enable_jdbc in
+ yes|auto) enable_jdbc=$enable_jdbc;;
+ *) enable_jdbc=no;;
+esac
-if test "x$enable_java" != xno; then
- AC_ARG_ENABLE(jdbc,
- AS_HELP_STRING([--enable-jdbc], [build the MonetDB JDBC
driver]),
- enable_jdbc="$enableval",
- enable_jdbc=auto)
- case $enable_jdbc in
- yes|auto) enable_jdbc=$enable_jdbc;;
- *) enable_jdbc=no;;
- esac
-
- AC_ARG_ENABLE(merocontrol,
- AS_HELP_STRING([--enable-merocontrol], [build the Merovingian
control driver]),
- enable_control="$enableval",
- enable_control=auto)
- case $enable_control in
- yes|auto) enable_control=$enable_control;;
- *) enable_control=no;;
- esac
-else
- enable_jdbc=no
- enable_control=no
- disable_jdbc="(as java is disabled)"
- disable_control="(as java is disabled)"
-fi
+AC_ARG_ENABLE(merocontrol,
+ AS_HELP_STRING([--enable-merocontrol], [build the Merovingian control
driver]),
+ enable_control="$enableval",
+ enable_control=auto)
+case $enable_control in
+ yes|auto) enable_control=$enable_control;;
+ *) enable_control=no;;
+esac
dnl RIPEMD160 is patent free, academic and European, but unfortunately
dnl can't use it by default, as that would exclude JDBC usage (Java
@@ -1722,15 +1710,11 @@
JAVAC="javac"
JAR="jar"
JAVADOC="javadoc"
-if test "x$enable_java" != xno; then
- AC_ARG_WITH(java,
- AS_HELP_STRING([--with-java=DIR],
- [java, javac, jar and javadoc are installed in
DIR/bin]),
- have_java="$withval",
- have_java="$enable_java")
-else
- have_java=no
-fi
+AC_ARG_WITH(java,
+ AS_HELP_STRING([--with-java=DIR],
+ [java, javac, jar and javadoc are installed in DIR/bin]),
+ have_java="$withval",
+ have_java=auto)
JPATH=$PATH
case $have_java in
yes|no|auto)
@@ -1794,6 +1778,12 @@
AC_MSG_ERROR([MonetDB JDBC requires ant and Java])
;;
no-*)
+ enable_jdbc=no
+ if test x$ANT = xno ; then
+ disable_jdbc="(ant is required to build MonetDB JDBC)"
+ else
+ disable_jdbc="(Java is required to build MonetDB JDBC)"
+ fi
;;
*)
req_java_ver_min=1.5 # >= $req_java_ver_min required
@@ -1804,7 +1794,8 @@
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.])
else
- AC_MSG_WARN([Cannot build MonetDB JDBC as it requires
ant and Java >= $req_java_ver_min, but < $req_java_ver_max.])
+ enable_jdbc=no
+ disable_jdbc="(MonetDB JDBC currently requires Java >=
$req_java_ver_min, but < $req_java_ver_max to build)"
fi
fi
;;
@@ -1819,6 +1810,12 @@
AC_MSG_ERROR([Merovingian control requires ant and Java])
;;
no-*)
+ enable_control=no
+ if test x$ANT = xno ; then
+ disable_control="(ant is required to build merovingian Java
control library)"
+ else
+ disable_control="(Java is required to build merovingian Java
control library)"
+ fi
;;
*)
req_java_ver_min=1.5 # >= $req_java_ver_min required
@@ -1828,7 +1825,8 @@
if test "x$enable_control" = xyes; then
AC_MSG_ERROR([Merovingian control requires ant and Java
>= $req_java_ver_min.])
else
- AC_MSG_WARN([Cannot build Merovingian control as it
requires ant and Java >= $req_java_ver_min.])
+ enable_control=no
+ disable_control="(merovingian Java control library
requires Java >= $req_java_ver_min)"
fi
fi
;;
@@ -2306,6 +2304,15 @@
fi
AC_SUBST(ODBC_INCS)
AC_SUBST(ODBC_LIBS)
+ case "x${enable_odbc}x${have_unixodbc}" in
+ xautoxno)
+ enable_odbc=no
+ disable_odbc="(unixODBC library required for ODBC
driver)"
+ ;;
+ xyesxno)
+ AC_MSG_ERROR([unixODBC required for building ODBC
driver])
+ ;;
+ esac
else
have_unixodbc=no
fi
@@ -3163,8 +3170,7 @@
geom \
fits \
rdf \
- unixodbc \
- java \
+ odbc \
jdbc \
control \
testing \
diff --git a/geom/monetdb5/geom.mx b/geom/monetdb5/geom.mx
--- a/geom/monetdb5/geom.mx
+++ b/geom/monetdb5/geom.mx
@@ -501,10 +501,10 @@
return a;
}
-geom_export void
+geom_export int
mbrWRITE(mbr *c, stream *s, size_t cnt);
-void
+int
mbrWRITE(mbr *c, stream *s, size_t cnt)
{
size_t i;
@@ -517,8 +517,9 @@
!mnstr_writeInt(s, (int) c->ymin) ||
!mnstr_writeInt(s, (int) c->xmax) ||
!mnstr_writeInt(s, (int) c->ymax))
- break;
+ return GDK_FAIL;
}
+ return GDK_SUCCEED;
}
geom_export str
@@ -837,18 +838,21 @@
return a;
}
-geom_export void
+geom_export int
wkbWRITE(wkb *a, stream *s, size_t cnt);
-void
+int
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
