Changeset: c255eaca29f0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c255eaca29f0
Modified Files:
monetdb5/mal/Tests/All
sql/backends/monet5/sql_scenario.c
Branch: default
Log Message:
Merge with Jan2014 branch.
diffs (31 lines):
diff --git a/monetdb5/mal/Tests/All b/monetdb5/mal/Tests/All
--- a/monetdb5/mal/Tests/All
+++ b/monetdb5/mal/Tests/All
@@ -135,11 +135,13 @@ tst260
tst2570
# tst265 -- windowsum and slidingsum have been removed
tst267
-tst270
+# opens /tmp/MonetEvents, i.e. not on Windows:
+NOT_WIN32?tst270
tst272
tst273
tst274
-tst275
+# opens /tmp/MonetEvents, i.e. not on Windows:
+NOT_WIN32?tst275
tst277
tst280
tst292
diff --git a/sql/backends/monet5/sql_scenario.c
b/sql/backends/monet5/sql_scenario.c
--- a/sql/backends/monet5/sql_scenario.c
+++ b/sql/backends/monet5/sql_scenario.c
@@ -1118,7 +1118,7 @@ SQLinitClient(Client c)
struct stat st;
if (fstat(fileno(getFile(fd)), &st) < 0)
st.st_size = 128 * BLOCK;
- bfd = bstream_create(fd, BLOCK *
(st.st_size / BLOCK + 1));
+ bfd = bstream_create(fd, (size_t)
st.st_size);
if (bfd && bstream_next(bfd) >= 0)
msg = SQLstatementIntern(c,
&bfd->buf, "sql.init", TRUE, FALSE);
bstream_destroy(bfd);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
