diff --git a/manifest b/manifest
index 43f0c1ed30..a959183ef3 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Version\s3.6.0\s(CVS\s5423)
-D 2008-07-16T14:44:40
+C Fix\sa\stest\sin\sfunc.test\sso\sthat\sit\sworks\son\smachines\sthat\slack\slong\sdouble.\s(CVS\s5425)
+D 2008-07-16T18:04:37
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in a03f7cb4f7ad50bc53a788c6c544430e81f95de4
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -336,7 +336,7 @@ F test/fts3b.test b3a25180a633873d37d86e1ccd00ed690d37237a
 F test/fts3c.test 4c7ef29b37aca3e8ebb6a39b57910caa6506034e
 F test/fts3d.test d92a47fe8ed59c9e53d2d8e6d2685bb380aadadc
 F test/fts3near.test 2d4dadcaac5025ab65bb87e66c45f39e92966194
-F test/func.test 92f017ac3c1fb85c8015800aa578a1d588a237a4
+F test/func.test 070ae66e38dfe159a78aeceda4ceb9d84c79b4fb
 F test/fuzz.test 62fc19dd36a427777fd671b569df07166548628a
 F test/fuzz2.test ea38692ce2da99ad79fe0be5eb1a452c1c4d37bb
 F test/fuzz_common.tcl ff4bc2dfc465f6878f8e2d819620914365382731
@@ -608,7 +608,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 5c26f63e476be3e18b2acdec5dd459da3bfceefa
-R 5c550f7e6607b94cb19c3002126beb0b
+P 1841aee6045b00cf4ab7b8485f5ab537d5fcd272
+R 8f639165d0cabfcde66742c2739c4326
 U drh
-Z 2534a6e8feb906e179b75b26e95f703e
+Z f1ce4c404d5037a5b2007a246716de72
diff --git a/manifest.uuid b/manifest.uuid
index 0b8dba9305..f68e744817 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1841aee6045b00cf4ab7b8485f5ab537d5fcd272
\ No newline at end of file
+8686959d4289dc0bf9e1c353b948f26cca5a9a65
\ No newline at end of file
diff --git a/test/func.test b/test/func.test
index b4d0dbd569..dd2ce9d65b 100644
--- a/test/func.test
+++ b/test/func.test
@@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this file is testing built-in functions.
 #
-# $Id: func.test,v 1.82 2008/07/15 00:27:35 drh Exp $
+# $Id: func.test,v 1.83 2008/07/16 18:04:37 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -298,10 +298,17 @@ do_test func-8.5 {
 } {0}
 do_test func-8.6 {
   execsql {
-    SELECT sum(x) FROM (SELECT '9223372036' || '854775808' AS x
+    SELECT typeof(sum(x)) FROM (SELECT '9223372036' || '854775808' AS x
                         UNION ALL SELECT -9223372036854775807)
   }
-} {1.0}
+} {real}
+do_test func-8.7 {
+  execsql {
+    SELECT round(sum(x)/16384.0)
+      FROM (SELECT '9223372036' || '854775808' AS x
+                        UNION ALL SELECT -9223372036850000000)
+  }
+} {291.0}
 
 # How do you test the random() function in a meaningful, deterministic way?
 #