Changeset: 3e511952f921 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3e511952f921
Modified Files:
buildtools/conf/MonetDB.m4
clients/src/mapilib/Mapi.mx
Branch: default
Log Message:
Merge with Oct2010 branch.
diffs (61 lines):
diff -r e6e8de5cb0ca -r 3e511952f921 buildtools/conf/MonetDB.m4
--- a/buildtools/conf/MonetDB.m4 Mon Dec 06 15:03:44 2010 +0100
+++ b/buildtools/conf/MonetDB.m4 Mon Dec 06 17:48:11 2010 +0100
@@ -223,12 +223,12 @@
if test "x$have_monetdb" = "xincluded"; then
have_monetdb=yes
- MONETDB_INCLUDEDIR="\$(top_srcdir)/../../MonetDB/MonetDB"
- # root is necessary for sysdefs.h
+ MONETDB_INCLUDEDIR="\$(top_srcdir)/../../MonetDB/MonetDB"
+ # root is necessary for sysdefs.h
MONETDB_INCS="-I${MONETDB_INCLUDEDIR} -I${MONETDB_INCLUDEDIR}/src/common
-I${MONETDB_INCLUDEDIR}/src/gdk"
- MONETDB_LIBS="-L${MONETDB_INCLUDEDIR}
-L${MONETDB_INCLUDEDIR}/src/common -L${MONETDB_INCLUDEDIR}/src/gdk"
- MONETDB_PREFIX="${prefix}"
- MONETDB_CONFDIR="${pkgdatadir}/conf"
+ MONETDB_LIBS="-L${MONETDB_INCLUDEDIR} -L${MONETDB_INCLUDEDIR}/src/common
-L${MONETDB_INCLUDEDIR}/src/gdk"
+ MONETDB_PREFIX="${prefix}"
+ MONETDB_CONFDIR="${pkgdatadir}/conf"
elif test "x$have_monetdb" != xyes; then
MONETDB_INCS=""
MONETDB_INCLUDEDIR=""
diff -r e6e8de5cb0ca -r 3e511952f921 clients/src/mapilib/Mapi.mx
--- a/clients/src/mapilib/Mapi.mx Mon Dec 06 15:03:44 2010 +0100
+++ b/clients/src/mapilib/Mapi.mx Mon Dec 06 17:48:11 2010 +0100
@@ -1815,8 +1815,9 @@
return MERROR;
if (hdl->result &&
(hdl->result->querytype == -1 ||
- hdl->result->querytype == Q_TABLE ||
- hdl->result->querytype == Q_UPDATE ||
+ /* basically exclude Q_PARSE and Q_BLOCK */
+ (hdl->result->querytype >= Q_TABLE &&
+ hdl->result->querytype <= Q_PREPARE) ||
hdl->result->errorstr != NULL))
return 1;
}
@@ -1852,8 +1853,9 @@
while (result->next) {
result = result->next;
if (result->querytype == -1 ||
- result->querytype == Q_TABLE ||
- result->querytype == Q_UPDATE ||
+ /* basically exclude Q_PARSE and Q_BLOCK */
+ (hdl->result->querytype >= Q_TABLE &&
+ hdl->result->querytype <= Q_PREPARE) ||
result->errorstr != NULL)
return 1;
}
@@ -4051,10 +4053,10 @@
normal output for the current one */
if (result == NULL ||
result->cache.writer > 0 ||
- result->querytype == Q_TABLE ||
- result->querytype == Q_UPDATE)
+ result->querytype > 0)
{
result = new_result(hdl);
+ result->commentonly = 0;
hdl->active = result;
}
add_error(result, line + 1 /* skip ! */ );
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
