Changeset: d77326d3abc9 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d77326d3abc9
Modified Files:
monetdb5/mal/mal_resource.c
sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out.Windows
Branch: default
Log Message:
Merge with Feb2013 branch.
diffs (24 lines):
diff --git a/monetdb5/mal/mal_resource.c b/monetdb5/mal/mal_resource.c
--- a/monetdb5/mal/mal_resource.c
+++ b/monetdb5/mal/mal_resource.c
@@ -196,7 +196,7 @@ MALresourceFairness(lng usec)
#endif
#endif
- /* use GDKmem_cursize as MT_getrss(); is to expensive */
+ /* use GDKmem_cursize as MT_getrss() is too expensive */
rss = GDKmem_cursize();
/* ample of memory available*/
if ( rss < MEMORY_THRESHOLD * monet_memory && usec <= TIMESLICE)
diff --git
a/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out.Windows
b/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out.Windows
---
a/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out.Windows
+++
b/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out.Windows
@@ -28,7 +28,7 @@ Ready.
% .plan # table_name
% rel # name
% clob # type
-% 189 # length
+% 191 # length
insert(
| table(sys.cm_tmp) [ cm_tmp.i, cm_tmp.%TID% NOT NULL ]
| union (
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
