diff -r a2c8fc23c90e -r 1a7853a4257e src/server/util/system.c
--- a/src/server/util/system.c	Wed Feb 22 23:20:39 2012 +0100
+++ b/src/server/util/system.c	Thu Feb 23 13:10:04 2012 +0100
@@ -92,7 +92,7 @@
 NSAPI_PUBLIC char *system_version()
 {
     //return PRODUCT_ID"/"PRODUCT_VERSION_ID;
-    return "Solaris 11 Express";
+    return "Solaris 11";
 }
 
 NSAPI_PUBLIC pool_handle_t *system_pool(void)
@@ -106,7 +106,7 @@
     ret = pool_malloc(MALLOC_KEY, size);
     if (!ret) {
         //ereport_outofmemory();
-        PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
+        //PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0); // TODO
     }
     return ret;
 }
@@ -120,7 +120,7 @@
         ZERO(ret, size);
     } else {
         //ereport_outofmemory();
-        PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
+        //PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0); // TODO
     }
     return ret;
 }
@@ -132,7 +132,7 @@
     ret = pool_realloc(MALLOC_KEY, ptr, size);
     if (!ret) {
         //ereport_outofmemory();
-        PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
+        //PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
     }
     return ret;
 }
@@ -150,7 +150,7 @@
     ret = pool_strdup(MALLOC_KEY, ptr);
     if (!ret) {
         //ereport_outofmemory();
-        PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
+        //PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
     }
     return ret;
 }
@@ -184,7 +184,7 @@
 #endif
     if (!ret) {
         //ereport_outofmemory();
-        PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
+        //PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
     }
     return ret;
 }
@@ -234,7 +234,7 @@
 
     if (!ret) {
         //ereport_outofmemory();
-        PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
+        //PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
     }
 
     return ret;
@@ -298,7 +298,7 @@
 
     if (!ret) {
         //ereport_outofmemory();
-        PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
+        //PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
     }
 
     return ret;
@@ -336,8 +336,9 @@
 NSAPI_PUBLIC void
 InitThreadMallocKey(void)
 {
-    PR_NewThreadPrivateIndex((unsigned int *)&thread_malloc_key, NULL);
-    PR_ASSERT(thread_malloc_key);
+    // TODO
+    //PR_NewThreadPrivateIndex((unsigned int *)&thread_malloc_key, NULL);
+    //PR_ASSERT(thread_malloc_key);
 }
 
 #ifdef XP_WIN32