Merge tag 'upstream/3.2.0'

Upstream version 3.2.0

# gpg: Signature made Thu 16 Oct 2014 10:51:39 PM EDT using RSA key ID 374BBE81
# gpg: Good signature from "Hans-Christoph Steiner <hans@guardianproject.info>"
# gpg:                 aka "Hans-Christoph Steiner <hans@eds.org>"
# gpg:                 aka "Hans-Christoph Steiner <hans@at.or.at>"
# gpg:                 aka "[jpeg image of size 5408]"

1 files changed, 20 insertions, 3 deletions

diff --git a/test/softheap1.test b/test/softheap1.test
index 6855553..522e455 100644
--- a/test/softheap1.test
+++ b/test/softheap1.test
@@ -24,10 +24,27 @@ ifcapable !integrityck {
   return
 }
 
-sqlite3_soft_heap_limit -1
-sqlite3_soft_heap_limit 0
-sqlite3_soft_heap_limit 5000
+do_test softheap1-1.0 {
+  execsql {PRAGMA soft_heap_limit}
+} [sqlite3_soft_heap_limit -1]
 do_test softheap1-1.1 {
+  execsql {PRAGMA soft_heap_limit=123456; PRAGMA soft_heap_limit;}
+} {123456 123456}
+do_test softheap1-1.2 {
+  sqlite3_soft_heap_limit -1
+} {123456}
+do_test softheap1-1.3 {
+  execsql {PRAGMA soft_heap_limit(-1); PRAGMA soft_heap_limit;}
+} {123456 123456}
+do_test softheap1-1.4 {
+  execsql {PRAGMA soft_heap_limit(0); PRAGMA soft_heap_limit;}
+} {0 0}
+
+sqlite3_soft_heap_limit 5000
+do_test softheap1-2.0 {
+  execsql {PRAGMA soft_heap_limit}
+} {5000}
+do_test softheap1-2.1 {
   execsql {
     PRAGMA auto_vacuum=1;
     CREATE TABLE t1(x);