diff --git a/manifest b/manifest
index d41a707a79..9d968573bf 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Omit\sa\scouple\sof\stest\scases\sif\sthe\slibrary\sis\scompiled\swithout\ssubqueries.\s(CVS\s2488)
-D 2005-05-29T14:23:13
+C Fix\sa\sbug\sin\sthe\smalloc2\stests\sintroduced\sby\scheckin\s(2473).\s(CVS\s2489)
+D 2005-06-06T14:45:43
 F Makefile.in 8129e7f261d405db783676f9ca31e0841768c652
 F Makefile.linux-gcc 06be33b2a9ad4f005a5f42b22c4a19dab3cbb5c7
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -71,7 +71,7 @@ F src/test2.c 716c1809dba8e5be6093703e9cada99d627542dc
 F src/test3.c 683e1e3819152ffd35da2f201e507228921148d0
 F src/test4.c 7c6b9fc33dd1f3f93c7f1ee6e5e6d016afa6c1df
 F src/test5.c 64f08b2a50ef371a1bd68ff206829e7b1b9997f5
-F src/tokenize.c fbe48ad208263b7c493fe16e29a293e6d47b451a
+F src/tokenize.c d89743f2c0d05d49b5b4d6462432a1f3cc4765f1
 F src/trigger.c 1a6d0c7c51b70bdc58d5068be72034071eff23ad
 F src/update.c 04ea9dd784ccfeaf38a681b3edfe3b1c4edfdda7
 F src/utf.c bda5eb85039ef16f2d17004c1e18c96e1ab0a80c
@@ -157,7 +157,7 @@ F test/lock2.test 59c3dd7d9b24d1bf7ec91b2d1541c37e97939d5f
 F test/lock3.test 615111293cf32aa2ed16d01c6611737651c96fb9
 F test/main.test febb69416071134dc38b9b1971c0c2e5b0ca3ff8
 F test/malloc.test b7bc72bb1627e09d6003f58de9bcd6e4be839753
-F test/malloc2.test 93b07cd12f9776161bc724dbf7b749817e982a49
+F test/malloc2.test 655b972372d2754a3f6c6ed54d7cfd18fde9bd32
 F test/memdb.test 1860e060be810bf0775bc57408a5b7c4954bcaea
 F test/memleak.test df2b2b96e77f8ba159a332299535b1e5f18e49ac
 F test/minmax.test 9429a06f1f93acf76fcacafd17160a4392e88526
@@ -281,7 +281,7 @@ F www/tclsqlite.tcl 425be741b8ae664f55cb1ef2371aab0a75109cf9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b
 F www/whentouse.tcl 528299b8316726dbcc5548e9aa0648c8b1bd055b
-P 3ac4a212bd70abb94d24830c73f7121df51125c7
-R b3a0f68d8db0720c7cbbb9b80db757ce
-U danielk1977
-Z a8138bfc19beff732a86427d8d3a96ae
+P 6bc372978364a1a4bfa14732a818a6bba613b1e3
+R c07667a46ec74b005cbbe569bfa7a722
+U drh
+Z d0ae35c886d8d1aee0549d8443c95180
diff --git a/manifest.uuid b/manifest.uuid
index 84d041dfd8..cff81480af 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6bc372978364a1a4bfa14732a818a6bba613b1e3
\ No newline at end of file
+fafaa18eea1e7142e1094b5f6d544d20c9df7c0f
\ No newline at end of file
diff --git a/src/tokenize.c b/src/tokenize.c
index ddeb2412f2..a54abb96c4 100644
--- a/src/tokenize.c
+++ b/src/tokenize.c
@@ -15,7 +15,7 @@
 ** individual tokens and sends those tokens one-by-one over to the
 ** parser for analysis.
 **
-** $Id: tokenize.c,v 1.102 2005/05/22 20:12:37 drh Exp $
+** $Id: tokenize.c,v 1.103 2005/06/06 14:45:43 drh Exp $
 */
 #include "sqliteInt.h"
 #include "os.h"
@@ -344,7 +344,7 @@ int sqlite3RunParser(Parse *pParse, const char *zSql, char **pzErrMsg){
   pEngine = sqlite3ParserAlloc((void*(*)(int))sqlite3MallocX);
   if( pEngine==0 ){
     sqlite3SetString(pzErrMsg, "out of memory", (char*)0);
-    return 1;
+    return SQLITE_NOMEM;
   }
   assert( pParse->sLastToken.dyn==0 );
   assert( pParse->pNewTable==0 );
diff --git a/test/malloc2.test b/test/malloc2.test
index 4935cba0eb..51164872a0 100644
--- a/test/malloc2.test
+++ b/test/malloc2.test
@@ -11,7 +11,7 @@
 # This file attempts to check that the library can recover from a malloc()
 # failure when sqlite3_global_recover() is invoked.
 #
-# $Id: malloc2.test,v 1.2 2005/03/29 03:11:00 danielk1977 Exp $
+# $Id: malloc2.test,v 1.3 2005/06/06 14:45:43 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -48,15 +48,13 @@ proc cksum {db} {
       SELECT 'sqlite_master'
     }
   }
-  foreach tbl [$db eval $sql] {
-    set cols [list]
-    $db eval "PRAGMA table_info($tbl)" {
-      lappend cols $name
-    }
-    set sql "SELECT md5sum([join $cols ,]) FROM $tbl"
-    lappend ret [db onecolumn $sql]
+  set tbllist [$db eval $sql]
+  set txt {}
+  foreach tbl $tbllist {
+    append txt [$db eval "SELECT * FROM $tbl"]
   }
-  return $ret
+  # puts txt=$txt
+  return [md5 $txt]
 }
 
 proc do_malloc2_test {tn args} {
@@ -69,7 +67,7 @@ proc do_malloc2_test {tn args} {
     # may or may not be reported.
     sqlite_malloc_fail $::n
     do_test malloc2-$tn.$::n.2 {
-      set res [catchsql $::mallocopts(-sql)]
+      set res [catchsql [string trim $::mallocopts(-sql)]]
       set rc [expr { 
         0==[string compare $res {1 {out of memory}}] ||
         0==[lindex $res 0]