From: danielk1977 <danielk1977@noemail.net>
Date: Tue, 10 Feb 2009 11:17:43 +0000 (+0000)
Subject: Reenable triggering vdbe tracing by creating file-system entries. Add a (redundant... 
X-Git-Tag: version-3.6.15~476
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cd503d6a3b9c34e66470e4db6307bf6e0b9f98d4;p=thirdparty%2Fsqlite.git

Reenable triggering vdbe tracing by creating file-system entries. Add a (redundant) test that modifying the temp schema expires all prepared statements. (CVS 6274)

FossilOrigin-Name: f6590dac4612d0d05105fa820e8fcb80b5907a40
---

diff --git a/manifest b/manifest
index 927c896b99..8a9e47c9a8 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Do\snot\salways\sopen\sa\stransaction\son\sthe\stemp\sdatabase\swhen\swriting\sto\sthe\smain\sor\sanother\sattached\sdatabase.\s(CVS\s6273)
-D 2009-02-10T10:44:42
+C Reenable\striggering\svdbe\stracing\sby\screating\sfile-system\sentries.\sAdd\sa\s(redundant)\stest\sthat\smodifying\sthe\stemp\sschema\sexpires\sall\sprepared\sstatements.\s(CVS\s6274)
+D 2009-02-10T11:17:43
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in c7a5a30fb6852bd7839b1024e1661da8549878ee
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -200,7 +200,7 @@ F src/update.c 8c4925f9ca664effc8a1faaad67449d2074567b1
 F src/utf.c 1da9c832dba0fa8f865b5b902d93f420a1ee4245
 F src/util.c 1363f64351f3b544790f3c523439354c02f8c4e9
 F src/vacuum.c 4929a585ef0fb1dfaf46302f8a9c4aa30c2d9cf5
-F src/vdbe.c 0be895a0c3e9c241c14c6de60806509b3eff6e2d
+F src/vdbe.c 473169c1957f4f06048974613ce3c1ba7d8d5c21
 F src/vdbe.h 03516f28bf5aca00a53c4dccd6c313f96adb94f6
 F src/vdbeInt.h 13cb4868ea579b5a8f6b6b5098caa99cd5a14078
 F src/vdbeapi.c b23c4b1686f150a0ddc36459c8e3876be62638e1
@@ -551,7 +551,7 @@ F test/table.test 0aac9468b69d2683e68ee2682cdae28d82a453ec
 F test/tableapi.test 505031f15b18a750184d967d2c896cf88fcc969c
 F test/tclsqlite.test 413a8a887d89ea8fa7055e8d118ffb03b0a4c91a
 F test/tempdb.test b88ac8a19823cf771d742bf61eef93ef337c06b1
-F test/temptable.test 19b851b9e3e64d91e9867619b2a3f5fffee6e125
+F test/temptable.test 5d8ca46be28cc06c887c5a77df650843b7edbae1
 F test/tester.tcl b28d5eb97e95b19eacdb5afb38db2c8558f398b0
 F test/thread001.test 7595e58213eda498794860f608e0ea7e499d18d0
 F test/thread002.test 0258a50c55f2371de2e4c7e02bec2576c1eef359
@@ -701,7 +701,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P d919d2a14c8cbbda3fbd6fb2ddae174fa709177b
-R 705f428cee859d1582e789ec2f8b6f2f
+P f76b0b8129657eace0a933ac1988b472d5e79c98
+R 6e6eb1e0d0625b1ce4b37064e68eaf68
 U danielk1977
-Z 80406d66de40997e19175586c6bca0ee
+Z 376a72b4f9c5f778523235cde007d098
diff --git a/manifest.uuid b/manifest.uuid
index b42858a700..8e96a97eab 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f76b0b8129657eace0a933ac1988b472d5e79c98
\ No newline at end of file
+f6590dac4612d0d05105fa820e8fcb80b5907a40
\ No newline at end of file
diff --git a/src/vdbe.c b/src/vdbe.c
index 715fcdffaf..045fac6a6b 100644
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -43,7 +43,7 @@
 ** in this file for details.  If in doubt, do not deviate from existing
 ** commenting and indentation practices when changing or adding code.
 **
-** $Id: vdbe.c,v 1.815 2009/02/09 13:19:28 drh Exp $
+** $Id: vdbe.c,v 1.816 2009/02/10 11:17:43 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 #include "vdbeInt.h"
@@ -482,9 +482,6 @@ static void registerTrace(FILE *out, int iReg, Mem *p){
    if( db->u1.isInterrupted ) goto abort_due_to_interrupt;
 
 #ifdef SQLITE_DEBUG
-# define fileExists(A,B) 0
-#endif
-#if 0
 static int fileExists(sqlite3 *db, const char *zFile){
   int res = 0;
   int rc = SQLITE_OK;
diff --git a/test/temptable.test b/test/temptable.test
index 5fc40c4db0..e6f3855158 100644
--- a/test/temptable.test
+++ b/test/temptable.test
@@ -12,7 +12,7 @@
 #
 # This file implements tests for temporary tables and indices.
 #
-# $Id: temptable.test,v 1.19 2007/10/09 08:29:33 danielk1977 Exp $
+# $Id: temptable.test,v 1.20 2009/02/10 11:17:43 danielk1977 Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -419,4 +419,22 @@ ifcapable attach {
 #
 catch {file attributes test.db -readonly 0}
 
+do_test temptable-8.0 {
+  db close
+  catch {file delete -force test.db}
+  sqlite3 db test.db
+} {}
+do_test temptable-8.1 {
+  execsql { CREATE TEMP TABLE tbl2(a, b); }
+  execsql {
+    CREATE TABLE tbl(a, b);
+    INSERT INTO tbl VALUES(1, 2);
+  }
+  execsql {SELECT * FROM tbl}
+} {1 2}
+do_test temptable-8.2 {
+  execsql { CREATE TEMP TABLE tbl(a, b); }
+  execsql {SELECT * FROM tbl}
+} {}
+
 finish_test