Changeset: b3303af28eb2 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b3303af28eb2
Modified Files:
sql/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.err.Windows
sql/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.out.Windows
testing/monet_options.py.in
tools/mserver/mserver5.1
Branch: default
Log Message:
Merged with jan2014 branch.
diffs (58 lines):
diff --git
a/sql/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.err.Windows
b/sql/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.err.Windows
---
a/sql/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.err.Windows
+++
b/sql/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.err.Windows
@@ -10,9 +10,9 @@ stderr of test 'select_from_env.SF-12407
# 22:29:10 > mclient -lsql -i -umonetdb -Pmonetdb --host=pegasus --port=30332
# 22:29:10 >
-MAPI = (monetdb) /var/tmp/mtest-23209/.s.monetdb.33225
+MAPI = (monetdb) /var/tmp/mtest-28498/.s.monetdb.30263
QUERY = select * from env() as env where name = ( select 'prefix' from env()
as env );
-ERROR = !cardinality violation (20>1)
+ERROR = !cardinality violation (19>1)
# 13:22:15 >
# 13:22:15 > Done.
diff --git
a/sql/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.out.Windows
b/sql/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.out.Windows
---
a/sql/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.out.Windows
+++
b/sql/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.out.Windows
@@ -27,12 +27,11 @@ Ready.
% .env # table_name
% name # name
% varchar # type
-% 16 # length
+% 17 # length
[ "gdk_dbname" ]
[ "gdk_dbpath" ]
[ "gdk_debug" ]
-[ "gdk_mem_bigsize" ]
-[ "gdk_mem_pagebits" ]
+[ "gdk_mmap_pagesize" ]
[ "gdk_nr_threads" ]
[ "gdk_vmtrim" ]
[ "mal_listing" ]
diff --git a/testing/monet_options.py.in b/testing/monet_options.py.in
--- a/testing/monet_options.py.in
+++ b/testing/monet_options.py.in
@@ -74,7 +74,6 @@ class BuiltinOptions:
gdk_dbname = 'demo'
gdk_dbfarm = os.path.join('@QXlocalstatedir@','MonetDB')
gdk_debug = '0'
- gdk_mem_bigsize = '1024576'
monet_admin = 'adm'
monet_prompt = '>'
monet_welcome = 'yes'
diff --git a/tools/mserver/mserver5.1 b/tools/mserver/mserver5.1
--- a/tools/mserver/mserver5.1
+++ b/tools/mserver/mserver5.1
@@ -68,10 +68,6 @@ impact performance if set wrongly. The
values for optimal performance. Changing these parameters is
discouraged.
.P
-.IP "gdk_mem_bigsize"
-Memory chunks of size >= gdk_mem_bigsize (in bytes) will be mmaped
-anonymously. Default: 1<<20 == 1024576 == 1 MiB
-.\" for 32 bit systems try to claim 3G of (virtual) memory; ???
.IP "gdk_vmtrim"
Enable or disable the vmtrim thread which tries to unload memory that is
not in use. Default: yes
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
