diff --git a/manifest b/manifest
index f3e7704fed..6474745a56 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Change\sthreadtest3.c\sso\sthat\sSQLITE_SCHEMA\sreturns\sresult\sin\swarnings\nnot\shard\serrors.\s\sAdd\sthe\sDarwin-x86_64\splatform\sto\sreleasetest.tcl.
-D 2014-12-31T18:55:09.661
+C Disable\sthe\sbigsort.test\smodule\son\smachine\swith\sless\sthan\s8GB\sof\savailable\nRAM\sor\smachine,\sto\savoid\sthrashing.
+D 2014-12-31T19:58:32.224
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 7cd23e4fc91004a6bd081623e1bc6932e44828c0
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -366,7 +366,7 @@ F test/between.test 34d375fb5ce1ae283ffe82b6b233e9f38e84fc6c
 F test/bigfile.test aa74f4e5db51c8e54a1d9de9fa65d01d1eb20b59
 F test/bigfile2.test 1b489a3a39ae90c7f027b79110d6b4e1dbc71bfc
 F test/bigrow.test f0aeb7573dcb8caaafea76454be3ade29b7fc747
-F test/bigsort.test 835478d0ce83bd1e5b05c90571dedd9871a09196
+F test/bigsort.test 8299fa9298f4f1e02fc7d2712e8b77d6cd60e5a2
 F test/bind.test 3c7b320969000c441a70952b0b15938fbb66237c
 F test/bindxfer.test efecd12c580c14df5f4ad3b3e83c667744a4f7e0
 F test/bitvec.test 75894a880520164d73b1305c1c3f96882615e142
@@ -1234,7 +1234,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P f489bc31165f043dc10570e6c1250a292673660e
-R fb381e088e2268612fdb185243c3a797
+P b09a139c9e2e1a45a3d53395ac1376e952d459e5
+R 958bbb31d1168aa8cd0ac8a1eba90de6
 U drh
-Z 09baa910ae3dee28dd8ef1c911c03495
+Z 1f37f8136326091af864e56108cf76a8
diff --git a/manifest.uuid b/manifest.uuid
index 5518ac9017..d365d2d171 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b09a139c9e2e1a45a3d53395ac1376e952d459e5
\ No newline at end of file
+9d4fe11641043af4e663085e979f637676599da0
\ No newline at end of file
diff --git a/test/bigsort.test b/test/bigsort.test
index 259adc3747..c711515973 100644
--- a/test/bigsort.test
+++ b/test/bigsort.test
@@ -20,6 +20,15 @@ set testprefix bigsort
 # loop if the product was also an integer multiple of 2^32, or 
 # inefficiency otherwise.
 #
+# This test causes thrashing on machines with smaller amounts of
+# memory.  Make sure the host has at least 8GB available before running
+# this test.
+#
+if {[catch {exec free | grep Mem:} out] || [lindex $out 1]<8000000} {
+  finish_test
+  return
+}
+
 do_execsql_test 1.0 {
   PRAGMA page_size = 1024;
   CREATE TABLE t1(a, b);
@@ -39,5 +48,3 @@ do_execsql_test 1.1 {
 
 
 finish_test
-
-