Changes to get the Serialized Statement Extension working again. (CVS 3131)

FossilOrigin-Name: 255fdbe6fa31ce276a8e6511af4ec6c36a741c20

diff --git a/manifest b/manifest
index b048cb3dd277b3822629827b88f0f7bdf12d75bd..598906661b898bfa75bc281f29888896286105ec 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Additional\schanges\sdue\sto\sCoverity\sscans.\s(CVS\s3130)
-D 2006-03-13T12:54:10
+C Changes\sto\sget\sthe\sSerialized\sStatement\sExtension\sworking\sagain.\s(CVS\s3131)
+D 2006-03-13T14:28:05
 F Makefile.in 5d8dff443383918b700e495de42ec65bc1c8865b
 F Makefile.linux-gcc 74ba0eadf88748a9ce3fd03d2a3ede2e6715baec
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -34,7 +34,7 @@ F src/alter.c 451b34fc4eb2475ca76a2e86b21e1030a9428091
 F src/analyze.c 7d2b7ab9a9c2fd6e55700f69064dfdd3e36d7a8a
 F src/attach.c d73a3505de3fb9e373d0a158978116c4212031d0
 F src/auth.c 9ae84d2d94eb96195e04515715e08e85963e96c2
-F src/btree.c 861f6a805b55dbf37a35a0561e0cf5e99ed073ae
+F src/btree.c 96a383ddf9a391d017bfa36c89dc528ccfc5d9bb
 F src/btree.h 40055cfc09defd1146bc5b922399c035f969e56d
 F src/build.c 4bd8471e4f20f5623c15fd71d2aaee0f66e394d8
 F src/callback.c 1bf497306c32229114f826707054df7ebe10abf2
@@ -89,7 +89,7 @@ F src/update.c 34add66fcd3301b33b6e4c4c813f4e408f7ee4a0
 F src/utf.c 1d51225bce1ea8d1978e8ab28e862a0c12c7a8e8
 F src/util.c 59389ed717f0fa9d8023b3f482ba09dcf41343a8
 F src/vacuum.c 5b37d0f436f8e1ffacd17934e44720b38d2247f9
-F src/vdbe.c 5fb9d3e64ed18f82e71bd2ff94c3e5f07384c7d4
+F src/vdbe.c 2c687d8cf6b75380ef26a8c9db047ce0e3fa7424
 F src/vdbe.h 80ba1c391ec28180dd07a630577f50b22c2062da
 F src/vdbeInt.h 2109be6b58e3bfcd8e5b56d3b212b1a105a61051
 F src/vdbeapi.c 7dc662e7c905ce666bb506dced932e0307115cbf
@@ -355,7 +355,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P 0910022be3ec8ce540e0e6adce2eed7a7cd28fd3
-R 3b0768980a7df91b35d6774b73d561d5
+P a69f697d50124f2c0c654d56390ae83a4ac5e9e8
+R 88d366a1182cf27af32cd61f9e0ea7ee
 U drh
-Z 43c825bec0d49c278c25514cf14fe00a
+Z 86c65569dc0e41105f23665a78f26052

diff --git a/manifest.uuid b/manifest.uuid
index 4914685cd397613a52c0f7744d368843ea790608..3ee85d41c5639f3540d5ce10ae67f4775f69551e 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a69f697d50124f2c0c654d56390ae83a4ac5e9e8
\ No newline at end of file
+255fdbe6fa31ce276a8e6511af4ec6c36a741c20
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index 964c955ec60be7bf62b95d9c93b87378fa198d53..76fb26304ad0ecbc8bf65e67c0e804bfefbb1c7b 100644 (file)
--- a/src/btree.c
+++ b/src/btree.c
@@ -9,7 +9,7 @@
 **    May you share freely, never taking more than you give.
 **
 *************************************************************************
-** $Id: btree.c,v 1.318 2006/03/11 12:04:18 drh Exp $
+** $Id: btree.c,v 1.319 2006/03/13 14:28:05 drh Exp $
 **
 ** This file implements a external (disk-based) database using BTrees.
 ** For a detailed discussion of BTrees, refer to
@@ -1686,7 +1686,7 @@ int sqlite3BtreeOpen(
   assert( (pBt->pageSize & 7)==0 );  /* 8-byte alignment of pageSize */
   sqlite3pager_set_pagesize(pBt->pPager, pBt->pageSize);
 
-#ifndef SQLITE_OMIT_SHARED_CACHE
+#if !defined(SQLITE_OMIT_SHARED_CACHE) && !defined(SQLITE_OMIT_DISKIO)
   /* Add the new btree to the linked list starting at ThreadData.pBtree.
   ** There is no chance that a malloc() may fail inside of the 
   ** sqlite3ThreadData() call, as the ThreadData structure must have already

diff --git a/src/vdbe.c b/src/vdbe.c
index cb2f821d250ddce4a81bfd11c4046d9401d056e7..002c2df3c19c376db25220326db14a7828231f2a 100644 (file)
--- 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.544 2006/02/24 02:53:50 drh Exp $
+** $Id: vdbe.c,v 1.545 2006/03/13 14:28:05 drh Exp $
 */
 #include "sqliteInt.h"
 #include "os.h"
@@ -4071,7 +4071,7 @@ case OP_ParseSchema: {        /* no-push */
   break;  
 }
 
-#ifndef SQLITE_OMIT_ANALYZE
+#if !defined(SQLITE_OMIT_ANALYZE) && !defined(SQLITE_OMIT_PARSER)
 /* Opcode: LoadAnalysis P1 * *
 **
 ** Read the sqlite_stat1 table for database P1 and load the content
@@ -4084,7 +4084,7 @@ case OP_LoadAnalysis: {        /* no-push */
   sqlite3AnalysisLoad(db, iDb);
   break;  
 }
-#endif /* SQLITE_OMIT_ANALYZE */
+#endif /* !defined(SQLITE_OMIT_ANALYZE) && !defined(SQLITE_OMIT_PARSER)  */
 
 /* Opcode: DropTable P1 * P3
 **