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, 49 insertions, 1 deletions

diff --git a/test/mallocA.test b/test/mallocA.test
index 8995127..61e88a6 100644
--- a/test/mallocA.test
+++ b/test/mallocA.test
@@ -15,6 +15,7 @@
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 source $testdir/malloc_common.tcl
+set testprefix mallocA
 
 # Only run these tests if memory debugging is turned on.
 #
@@ -40,7 +41,6 @@ db eval {
 db close
 copy_file test.db test.db.bu
 
-
 do_malloc_test mallocA-1 -testdb test.db.bu -sqlbody {
   ANALYZE
 }
@@ -53,6 +53,7 @@ do_malloc_test mallocA-1.2 -testdb test.db.bu -sqlbody {
 do_malloc_test mallocA-1.3 -testdb test.db.bu -sqlbody {
   ANALYZE main.t1
 }
+
 ifcapable reindex {
   do_malloc_test mallocA-2 -testdb test.db.bu -sqlbody {
     REINDEX;
@@ -68,6 +69,53 @@ ifcapable reindex {
   }
 }
 
+reset_db
+sqlite3_db_config_lookaside db 0 0 0
+do_execsql_test 6-prep {
+  CREATE TABLE t1(a, b);
+  CREATE INDEX i1 ON t1(a, b);
+  INSERT INTO t1 VALUES('abc', 'w'); -- rowid=1
+  INSERT INTO t1 VALUES('abc', 'x'); -- rowid=2
+  INSERT INTO t1 VALUES('abc', 'y'); -- rowid=3
+  INSERT INTO t1 VALUES('abc', 'z'); -- rowid=4
+
+  INSERT INTO t1 VALUES('def', 'w'); -- rowid=5
+  INSERT INTO t1 VALUES('def', 'x'); -- rowid=6
+  INSERT INTO t1 VALUES('def', 'y'); -- rowid=7
+  INSERT INTO t1 VALUES('def', 'z'); -- rowid=8
+
+  ANALYZE;
+}
+
+do_faultsim_test 6.1 -faults oom* -body {
+  execsql { SELECT rowid FROM t1 WHERE a='abc' AND b='x' }
+} -test {
+  faultsim_test_result [list 0 2]
+}
+do_faultsim_test 6.2 -faults oom* -body {
+  execsql { SELECT rowid FROM t1 WHERE a='abc' AND b<'y' }
+} -test {
+  faultsim_test_result [list 0 {1 2}]
+}
+ifcapable stat3 {
+  do_test 6.3-prep {
+    execsql {
+      PRAGMA writable_schema = 1;
+      CREATE TABLE sqlite_stat4 AS 
+      SELECT tbl, idx, neq, nlt, ndlt, sqlite_record(sample) AS sample 
+      FROM sqlite_stat3;
+    }
+  } {}
+  do_faultsim_test 6.3 -faults oom* -body {
+    execsql { 
+      ANALYZE sqlite_master;
+      SELECT rowid FROM t1 WHERE a='abc' AND b<'y';
+    }
+  } -test {
+    faultsim_test_result [list 0 {1 2}]
+  }
+}
+
 # Ensure that no file descriptors were leaked.
 do_test malloc-99.X {
   catch {db close}