From 20c6cc2b1b81f297edd5c8f4868823fa5ab59cd3 Mon Sep 17 00:00:00 2001 From: danielk1977 Date: Wed, 1 Apr 2009 18:03:00 +0000 Subject: [PATCH] Remove the unused SQLITE_Vtab flag. (CVS 6425) FossilOrigin-Name: fdd78962fcb988edfb4147394045fc5d3944c620 --- manifest | 14 +++++++------- manifest.uuid | 2 +- src/btree.c | 7 ++----- src/sqliteInt.h | 3 +-- 4 files changed, 11 insertions(+), 15 deletions(-) diff --git a/manifest b/manifest index 64e6c75727..bfc0607ec4 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C In\spageReinit()\sin\sbtree.c,\sonly\sreinitialize\sa\spage\sif\sthere\sare\sone\sor\smore\sreferences\sto\sit,\snot\sincluding\sthe\stransient\sreference\sheld\sby\spager.c.\sThis\swas\salways\sthe\sintent.\s(CVS\s6424) -D 2009-04-01T17:13:51 +C Remove\sthe\sunused\sSQLITE_Vtab\sflag.\s(CVS\s6425) +D 2009-04-01T18:03:01 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 F Makefile.in 583e87706abc3026960ed759aff6371faf84c211 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 @@ -103,7 +103,7 @@ F src/auth.c c8b2ab5c8bad4bd90ed7c294694f48269162c627 F src/backup.c 0082d0e5a63f04e88faee0dff0a7d63d3e92a78d F src/bitvec.c 44f7059ac1f874d364b34af31b9617e52223ba75 F src/btmutex.c 341502bc496dc0840dcb00cde65680fb0e85c3ab -F src/btree.c abd530b62ab95735ca9ea001369192dcf34d21d9 +F src/btree.c 3e831426631f0eff0b56d7980ba39cfc53911727 F src/btree.h e302c5747494067cd4f5763000fbe7bca767d816 F src/btreeInt.h df64030d632f8c8ac217ed52e8b6b3eacacb33a5 F src/build.c 72357fd75ef036d0afbf1756edab6d62c56fcf4b @@ -159,7 +159,7 @@ F src/select.c bd494b68a54a51de3df94ecdd6d24fa7598929d1 F src/shell.c 0a11f831603f17fea20ca97133c0f64e716af4a7 F src/sqlite.h.in 0db1e59d89aeacb8fe64a19fd14c13a796060ccb F src/sqlite3ext.h 1db7d63ab5de4b3e6b83dd03d1a4e64fef6d2a17 -F src/sqliteInt.h afc93df0ddc3661b9b31b51edf43635b8df4e4de +F src/sqliteInt.h 22114af78e17ab06b4ccd3b3f7db8ab14b5f2bb9 F src/sqliteLimit.h ffe93f5a0c4e7bd13e70cd7bf84cfb5c3465f45d F src/status.c 237b193efae0cf6ac3f0817a208de6c6c6ef6d76 F src/table.c 332ab0ea691e63862e2a8bdfe2c0617ee61062a3 @@ -714,7 +714,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e -P 94e2f815ebb38981a2226d8aed9f3731f8833f7c -R 969797a9b971dcabb14bfdb8fddd941c +P 0c5a7d1117cfb322d1c89da89e8887b0bb091602 +R f26d04d59d851cd92941bca4f5f8b7ce U danielk1977 -Z 79fdfc4dbd1df7fe614486048e869a12 +Z fe1f6bbbe7362bf487c77efb4897a843 diff --git a/manifest.uuid b/manifest.uuid index 1bb104bcf9..a32670499e 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -0c5a7d1117cfb322d1c89da89e8887b0bb091602 \ No newline at end of file +fdd78962fcb988edfb4147394045fc5d3944c620 \ No newline at end of file diff --git a/src/btree.c b/src/btree.c index a81a424dd0..d012bbc70b 100644 --- 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.585 2009/04/01 17:13:51 danielk1977 Exp $ +** $Id: btree.c,v 1.586 2009/04/01 18:03:01 danielk1977 Exp $ ** ** This file implements a external (disk-based) database using BTrees. ** See the header comment on "btreeInt.h" for additional information. @@ -1399,10 +1399,7 @@ int sqlite3BtreeOpen( ** If this Btree is a candidate for shared cache, try to find an ** existing BtShared object that we can share with */ - if( isMemdb==0 - && (db->flags & SQLITE_Vtab)==0 - && zFilename && zFilename[0] - ){ + if( isMemdb==0 && zFilename && zFilename[0] ){ if( sqlite3GlobalConfig.sharedCacheEnabled ){ int nFullPathname = pVfs->mxPathname+1; char *zFullPathname = sqlite3Malloc(nFullPathname); diff --git a/src/sqliteInt.h b/src/sqliteInt.h index 8446ddbeb3..8fd2c89fe8 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -11,7 +11,7 @@ ************************************************************************* ** Internal interface definitions for SQLite. ** -** @(#) $Id: sqliteInt.h,v 1.849 2009/04/01 16:33:38 drh Exp $ +** @(#) $Id: sqliteInt.h,v 1.850 2009/04/01 18:03:01 danielk1977 Exp $ */ #ifndef _SQLITEINT_H_ #define _SQLITEINT_H_ @@ -875,7 +875,6 @@ struct sqlite3 { #define SQLITE_RecoveryMode 0x00040000 /* Ignore schema errors */ #define SQLITE_SharedCache 0x00080000 /* Cache sharing is enabled */ -#define SQLITE_Vtab 0x00100000 /* There exists a virtual table */ #define SQLITE_CommitBusy 0x00200000 /* In the process of committing */ #define SQLITE_ReverseOrder 0x00400000 /* Reverse unordered SELECTs */ -- 2.47.2