diff --git a/manifest b/manifest
index c4b757d4dc..f86027d517 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Expire\sall\sprepared\sstatements\swhenever\sthere\sis\sa\schange\sto\sthe\sschema\nof\sthe\sTEMP\sdatabase.\s\sTicket\s#1644.\s(CVS\s3036)
-D 2006-01-30T15:34:23
+C Add\sa\scouple\sof\sextra\stest\scases\sfor\s#1644.\s(CVS\s3037)
+D 2006-01-30T15:41:53
 F Makefile.in e936c6fc3134838318aa0335a85041e6da31f6ee
 F Makefile.linux-gcc 74ba0eadf88748a9ce3fd03d2a3ede2e6715baec
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -255,7 +255,7 @@ F test/tkt1514.test baa587a69fa2e8d575ebdaf1460f711281dcba49
 F test/tkt1536.test 83ff7a7b6e248016f8d682d4f7a4ae114070d466
 F test/tkt1537.test e3a14332de9770be8ff14bd15c19a49cbec10808
 F test/tkt1567.test 18023cc3626a365f0118e17b66decedec93b1a6f
-F test/tkt1644.test c44a4957874583de0854159d3481bed8facc9c2d
+F test/tkt1644.test 8926ebffd19950a7cce22734a06d8282a69c3a20
 F test/trace.test 75ffc1b992c780d054748a656e3e7fd674f18567
 F test/trans.test b25eae982d156867eac338409905fd4ca589b7f8
 F test/trigger1.test 0c1d44882dba5c92e4efee4dd133cc979f0b1860
@@ -348,7 +348,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P 944df310ce8d32798135c70becee7845676520ae
-R 29e2b008efd55eab83787ea3973e471c
-U drh
-Z 695d02c988e27778f6752e27ab962e1f
+P 4cd4efaf5ef40a07e76fba3073bbd2600ca7e327
+R e0a441e6ebe29160a2ace2ed9b323d24
+U danielk1977
+Z ac93a43b4afd1211012625b86c812388
diff --git a/manifest.uuid b/manifest.uuid
index 8ef5aa9a02..c5494d82c1 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4cd4efaf5ef40a07e76fba3073bbd2600ca7e327
\ No newline at end of file
+e10d229ff21ac884dda24f0ff936aaeb36ff9a3f
\ No newline at end of file
diff --git a/test/tkt1644.test b/test/tkt1644.test
index 3a3874800d..8772ca7802 100644
--- a/test/tkt1644.test
+++ b/test/tkt1644.test
@@ -19,6 +19,10 @@
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 
+ifcapable !tempdb {
+  finish_test
+  return
+}  
 
 # Create two tables T1 and T2 and make V1 point to T1.
 do_test tkt1644-1.1 {
@@ -64,5 +68,44 @@ do_test tkt1644-1.4 {
   }
 } {}
 
+ifcapable view {
+  do_test tkt1644-2.1 {
+    execsql {
+      CREATE TEMP TABLE temp_t1(a, b);
+    }
+    set ::DB [sqlite3_connection_pointer db]
+    set ::STMT [sqlite3_prepare $::DB "SELECT * FROM temp_t1" -1 DUMMY]
+    execsql {
+      DROP TABLE temp_t1;
+    }
+    list [sqlite3_step $::STMT] [sqlite3_finalize $::STMT]
+  } {SQLITE_ERROR SQLITE_SCHEMA}
+  
+  do_test tkt1644-2.2 {
+    execsql {
+      CREATE TABLE real_t1(a, b);
+      CREATE TEMP VIEW temp_v1 AS SELECT * FROM real_t1;
+    }
+    set ::DB [sqlite3_connection_pointer db]
+    set ::STMT [sqlite3_prepare $::DB "SELECT * FROM temp_v1" -1 DUMMY]
+    execsql {
+      DROP VIEW temp_v1;
+    }
+    list [sqlite3_step $::STMT] [sqlite3_finalize $::STMT]
+  } {SQLITE_ERROR SQLITE_SCHEMA}
+
+  do_test tkt1644-2.3 {
+    execsql {
+      CREATE TEMP VIEW temp_v1 AS SELECT * FROM real_t1 LIMIT 10 OFFSET 10;
+    }
+    set ::DB [sqlite3_connection_pointer db]
+    set ::STMT [sqlite3_prepare $::DB "SELECT * FROM temp_v1" -1 DUMMY]
+    execsql {
+      DROP VIEW temp_v1;
+    }
+    list [sqlite3_step $::STMT] [sqlite3_finalize $::STMT]
+  } {SQLITE_ERROR SQLITE_SCHEMA}
+}
+
 
 finish_test