Changeset: 74f08442f0a7 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=74f08442f0a7
Modified Files:
        MonetDB5/src/mal/mal.mx
Branch: Oct2010
Log Message:

Make sure monet_memory is initialized.
In case of an embedded server, monet_hello() isn't called, but
monet_hello() normally initializes monet_memory.  So we make sure the
value is initialized in mal_init() which is always called.
monet_memory is used by the MAL interpreter, so it is appropriate to
do this here.

This fixes bug 2701.


diffs (12 lines):

diff -r 0ff9e5806484 -r 74f08442f0a7 MonetDB5/src/mal/mal.mx
--- a/MonetDB5/src/mal/mal.mx   Mon Oct 25 12:36:30 2010 +0200
+++ b/MonetDB5/src/mal/mal.mx   Mon Oct 25 12:50:56 2010 +0200
@@ -377,6 +377,8 @@
        GDKprotect();
        tstAligned();
        memset((char*)mal_clients, 0, sizeof(ClientRec)*MAL_MAXCLIENTS);
+       if (monet_memory == 0)
+               monet_memory = MT_npages() * MT_pagesize();
        initNamespace();
        initParser();
        RECYCLEinit();
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list

Reply via email to