Index: test/tkt35xx.test
==================================================================
--- test/tkt35xx.test
+++ test/tkt35xx.test
@@ -12,15 +12,24 @@
 #
 # When a transaction rolls back, make sure that dirty pages in the
 # page cache which are not in the rollback journal are reinitialized
 # in the btree layer.
 #
-# $Id: tkt35xx.test,v 1.1 2008/11/21 03:23:43 drh Exp $
+# $Id: tkt35xx.test,v 1.2 2008/11/21 08:50:50 danielk1977 Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 
+do_test tkt35xx-1.1 {
+  execsql {
+    PRAGMA auto_vacuum = 0;
+    PRAGMA page_size = 1024;
+  }
+} {}
+
+# Trigger the problem using explicit rollback.
+#
 do_test tkt35xx-1.1 {
   execsql {
     PRAGMA auto_vacuum = 0;
     CREATE TABLE t1(a,b,c);
     CREATE INDEX i1 ON t1(c);
@@ -35,5 +44,63 @@
   }
   execsql {
     INSERT INTO t1 VALUES(1, 1, zeroblob(676));
   }
 } {}
+
+# Trigger the problem using statement rollback.
+#
+db close
+file delete test.db
+sqlite3 db test.db
+set big [string repeat abcdefghij 22]    ;# 220 byte string
+do_test tkt35xx-1.2.1 {
+  execsql {
+    PRAGMA auto_vacuum = 0;
+    PRAGMA page_size = 1024;
+    CREATE TABLE t3(a INTEGER PRIMARY KEY, b);
+    INSERT INTO t3 VALUES(1, $big);
+    INSERT INTO t3 VALUES(2, $big);
+    INSERT INTO t3 VALUES(3, $big);
+    INSERT INTO t3 VALUES(4, $big);
+    CREATE TABLE t4(c, d);
+    INSERT INTO t4 VALUES(5, $big);
+    INSERT INTO t4 VALUES(1, $big);
+  }
+} {}
+do_test tkt35xx-1.2.2 {
+  catchsql {
+    BEGIN;
+    CREATE TABLE t5(e PRIMARY KEY, f);
+    DROP TABLE t5;
+    INSERT INTO t3(a, b) SELECT c, d FROM t4;
+  }
+} {1 {PRIMARY KEY must be unique}}
+
+do_test tkt35xx-1.2.3 {
+  # Show that the transaction has not been rolled back.
+  catchsql BEGIN
+} {1 {cannot start a transaction within a transaction}}
+
+# Before the bug was fixed, if SQLITE_DEBUG was defined an assert()
+# would fail during the following INSERT statement. If SQLITE_DEBUG
+# was not defined, then the statement would pass and the transaction
+# would be committed. But, the "SELECT count(*)" in tkt35xx-1.2.6 would
+# return 1, not 5. Data magically disappeared!
+#
+do_test tkt35xx-1.2.4 {
+  execsql { SELECT count(*) FROM t3 }
+} {4}
+do_test tkt35xx-1.2.5 {
+  execsql { 
+    INSERT INTO t3 VALUES(5, $big);
+    COMMIT;
+  }
+} {}
+do_test tkt35xx-1.2.6 {
+  execsql { SELECT count(*) FROM t3 }
+} {5}
+
+integrity_check tkt35xx-1.2.7
+
+finish_test
+