Changeset: 907e47eeb08a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=907e47eeb08a
Modified Files:
monetdb5/modules/kernel/status.c
monetdb5/modules/mal/Tests/All
monetdb5/tests/suite_01/Tests/test_15.stable.out
Branch: default
Log Message:
merged
diffs (75 lines):
diff --git a/monetdb5/modules/kernel/status.c b/monetdb5/modules/kernel/status.c
--- a/monetdb5/modules/kernel/status.c
+++ b/monetdb5/modules/kernel/status.c
@@ -548,7 +548,7 @@ SYSioStatistics(int *ret, int *ret2)
BUNappend(bn, "maxrss", FALSE);
BUNappend(b, &i, FALSE);
i = ru.ru_minflt;
- BUNappend(b, "minflt", FALSE);
+ BUNappend(bn, "minflt", FALSE);
BUNappend(b, &i, FALSE);
i = ru.ru_majflt;
BUNappend(bn, "majflt", FALSE);
diff --git a/monetdb5/modules/mal/Tests/All b/monetdb5/modules/mal/Tests/All
--- a/monetdb5/modules/mal/Tests/All
+++ b/monetdb5/modules/mal/Tests/All
@@ -14,7 +14,7 @@ register00
mserver00
-modulechk.mal
+modulechk
qgram
diff --git a/monetdb5/tests/suite_01/Tests/test_15.stable.out
b/monetdb5/tests/suite_01/Tests/test_15.stable.out
--- a/monetdb5/tests/suite_01/Tests/test_15.stable.out
+++ b/monetdb5/tests/suite_01/Tests/test_15.stable.out
@@ -66,14 +66,15 @@ end main;
#-----------------------------------------#
# h t t # name
# void str int # type
-#-----------------------------------------#
-[ 0@0, "maxrss", 23856 ]
-[ 1@0, "majflt", 1718511981 ]
-[ 2@0, "nswap", 6421 ]
-[ 3@0, "inblock", 0 ]
-[ 4@0, "oublock", 0 ]
-[ 5@0, "nvcsw", 0 ]
-[ 6@0, "ninvcsw", 136 ]
+#---------------------------------#
+[ 0@0, "maxrss", 23060 ]
+[ 1@0, "minflt", 6205 ]
+[ 2@0, "majflt", 0 ]
+[ 3@0, "nswap", 0 ]
+[ 4@0, "inblock", 0 ]
+[ 5@0, "oublock", 152 ]
+[ 6@0, "nvcsw", 4 ]
+[ 7@0, "ninvcsw", 10 ]
#~EndVariableOutput~#
#commit(); commit(); commit(); commit(); commit(); commit(); commit();
commit();
#transaction.commit(); commit(); commit(); commit(); commit(); commit();
commit(); commit();
@@ -83,14 +84,15 @@ end main;
#-----------------------------------------#
# h t t # name
# void str int # type
-#-----------------------------------------#
-[ 0@0, "maxrss", 23904 ]
-[ 1@0, "majflt", 1718511981 ]
-[ 2@0, "nswap", 6433 ]
-[ 3@0, "inblock", 0 ]
-[ 4@0, "oublock", 0 ]
-[ 5@0, "nvcsw", 0 ]
-[ 6@0, "ninvcsw", 176 ]
+#---------------------------------#
+[ 0@0, "maxrss", 23116 ]
+[ 1@0, "minflt", 6216 ]
+[ 2@0, "majflt", 0 ]
+[ 3@0, "nswap", 0 ]
+[ 4@0, "inblock", 0 ]
+[ 5@0, "oublock", 192 ]
+[ 6@0, "nvcsw", 4 ]
+[ 7@0, "ninvcsw", 10 ]
#~EndVariableOutput~#
#quit();
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
