Changeset: 9a2ff0ca8d49 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9a2ff0ca8d49
Modified Files:
clients/mapiclient/stethoscope.c
clients/mapiclient/tachograph.c
clients/mapiclient/tomograph.c
sql/test/emptydb/updatetests
Branch: default
Log Message:
Merge with Jun2016 branch.
diffs (54 lines):
diff --git a/clients/mapiclient/stethoscope.c b/clients/mapiclient/stethoscope.c
--- a/clients/mapiclient/stethoscope.c
+++ b/clients/mapiclient/stethoscope.c
@@ -339,6 +339,9 @@ main(int argc, char **argv)
}
conn = mapi_get_from(dbh);
while ((n = mnstr_read(conn, buffer + len, 1, buflen - len-1)) >= 0) {
+ if (n == 0 &&
+ (n = mnstr_read(conn, buffer + len, 1, buflen - len-1)) <=
0)
+ break;
buffer[len + n] = 0;
response = buffer;
if( debug)
diff --git a/clients/mapiclient/tachograph.c b/clients/mapiclient/tachograph.c
--- a/clients/mapiclient/tachograph.c
+++ b/clients/mapiclient/tachograph.c
@@ -521,6 +521,9 @@ main(int argc, char **argv)
}
conn = mapi_get_from(dbh);
while ((n = mnstr_read(conn, buffer + len, 1, buflen - len-1)) >= 0) {
+ if (n == 0 &&
+ (n = mnstr_read(conn, buffer + len, 1, buflen - len-1)) <=
0)
+ break;
buffer[len + n] = 0;
response = buffer;
while ((e = strchr(response, '\n')) != NULL) {
diff --git a/clients/mapiclient/tomograph.c b/clients/mapiclient/tomograph.c
--- a/clients/mapiclient/tomograph.c
+++ b/clients/mapiclient/tomograph.c
@@ -1877,7 +1877,8 @@ main(int argc, char **argv)
resetTomograph();
conn = mapi_get_from(dbh);
while ((m = mnstr_read(conn, buffer + len, 1, buflen - len-1))
>= 0) {
- if (m == 0 && (m = mnstr_read(conn, buffer + len, 1,
buflen - len-1)) <= 0)
+ if (m == 0 &&
+ (m = mnstr_read(conn, buffer + len, 1, buflen -
len-1)) <= 0)
break;
buffer[len + m] = 0;
response = buffer;
diff --git a/sql/test/emptydb/updatetests b/sql/test/emptydb/updatetests
--- a/sql/test/emptydb/updatetests
+++ b/sql/test/emptydb/updatetests
@@ -11,7 +11,10 @@ 1)
fi
;;
0)
- if [ -f Tests/load.sql ] && [ -f Tests/check.SQL.py ]; then
+ case $0 in
+ */*) cd ${0%/*};;
+ esac
+ if [ -f Tests/load.sql ] && [ -f Tests/check.SQL.py.src ]; then
:
else
echo "bad directory"
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
