Ensure that the test vfs in test_journal.c zeroes sqlite3_file.pMethods if an xOpen...

FossilOrigin-Name: 45ae830d5631afa5d994361f5122c2f0b6fbab4c

diff --git a/manifest b/manifest
index fa1b130f8626f6fa0ecd5c2d5f8bb62a7e606da7..a43da9f5260eaad758d30b4a4753b6d16a161002 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\san\sunused\sparameter\sfrom\ssqlite3DequoteExpr.\s\sFix\sanother\sunrelated\nand\sharmless\scompiler\swarning.\s(CVS\s6386)
-D 2009-03-25T16:51:43
+C Ensure\sthat\sthe\stest\svfs\sin\stest_journal.c\szeroes\ssqlite3_file.pMethods\sif\san\sxOpen()\scall\sfails.\sSimilar\sproblem\sto\sthat\sfixed\sby\s#6384.\sThis\swas\sa\sproblem\swith\stest\scode,\snot\sSQLite\sitself.\s(CVS\s6387)
+D 2009-03-26T11:49:11
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 583e87706abc3026960ed759aff6371faf84c211
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -181,7 +181,7 @@ F src/test_config.c a05378089b6773ba36b85727dedf9ec0a16424ce
 F src/test_devsym.c 9f4bc2551e267ce7aeda195f3897d0f30c5228f4
 F src/test_func.c dd7bcaafb4e149702b506ede125ef6a4d4f6c471
 F src/test_hexio.c 2f1122aa3f012fa0142ee3c36ce5c902a70cd12f
-F src/test_journal.c 632011e420a581614343e78bc2fe77bd409a1706
+F src/test_journal.c 1d3fd9e79d8be1d99cdffa0b774805b2c962c782
 F src/test_loadext.c 97dc8800e46a46ed002c2968572656f37e9c0dd9
 F src/test_malloc.c d23050c7631ec9ee0369c7ca905e6c9233968e11
 F src/test_md5.c 032ae2bb6f81da350d2404e81fa8d560c8268026
@@ -709,7 +709,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P de469c46f55bf772ab8a49a185dc1b87360a937f
-R e9469f23b57c90d143aea36786246fc4
-U drh
-Z 62842deb068b8a746d76749ba0cbd568
+P 8589b0fcc51a32188386e442655fd91f421ca7f8
+R d3bafa860788dd3cbdc932b740db01e6
+U danielk1977
+Z 37170d0fa4349c466fb7ae22908082e4

diff --git a/manifest.uuid b/manifest.uuid
index fda1ddd2ee1627a1b2f53e0517bd5f7b48be4cd7..dcf08e7a270b46416a74a78eb18315aa86edc974 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8589b0fcc51a32188386e442655fd91f421ca7f8
\ No newline at end of file
+45ae830d5631afa5d994361f5122c2f0b6fbab4c
\ No newline at end of file

diff --git a/src/test_journal.c b/src/test_journal.c
index 92a38e85cca62b903bdd441330ad05aa2f7e4749..fab8d7f9d7915491cf53971312b6f2466b4bacf7 100644 (file)
--- a/src/test_journal.c
+++ b/src/test_journal.c
@@ -15,7 +15,7 @@
 ** correctly populates and syncs a journal file before writing to a
 ** corresponding database file.
 **
-** $Id: test_journal.c,v 1.12 2009/03/05 04:20:32 shane Exp $
+** $Id: test_journal.c,v 1.13 2009/03/26 11:49:11 danielk1977 Exp $
 */
 #if SQLITE_TEST          /* This file is used for testing only */
 
@@ -656,6 +656,7 @@ static int jtOpen(
 ){
   int rc;
   jt_file *p = (jt_file *)pFile;
+  pFile->pMethods = 0;
   p->pReal = (sqlite3_file *)&p[1];
   p->pReal->pMethods = 0;
   rc = sqlite3OsOpen(g.pVfs, zName, p->pReal, flags, pOutFlags);