Remove dead code. (CVS 5601)

FossilOrigin-Name: 6de9c084fc533fbb22af6a4cd3e4e9a461b13876

diff --git a/manifest b/manifest
index 743a423440d3c7719aa982d6416972801938e541..bafd9e2286d80cbfde4cd853efd5c7a63491dbf9 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C add\slegacy.lo\sback\s(in\salphabetical\sorder)\s(CVS\s5600)
-D 2008-08-22T17:28:46
+C Remove\sdead\scode.\s(CVS\s5601)
+D 2008-08-22T17:34:45
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 689e14735f862a5553bceef206d8c13e29504e44
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -96,7 +96,7 @@ F src/attach.c db3f4a60538733c1e4dcb9d0217a6e0d6ccd615b
 F src/auth.c c8b2ab5c8bad4bd90ed7c294694f48269162c627
 F src/bitvec.c 95c86bd18d8fedf0533f5af196192546e10a7e7d
 F src/btmutex.c 709cad2cdca0afd013f0f612363810e53f59ec53
-F src/btree.c e1b5c898ef2d6ed772d76b695765f0d24aa9719c
+F src/btree.c 4212dce1c446b8aa8bf2be7d39c6d93d169ace0b
 F src/btree.h 6371c5e599fab391a150c96afbc10062b276d107
 F src/btreeInt.h ab18c7b4980314e9e4b402e5dcde09f3c2545576
 F src/build.c 160c71acca8f643f436ed6c1ee2f684c88df4dfe
@@ -104,7 +104,7 @@ F src/callback.c 27e55dfafc66e97dd8e7343a1d7bb295f3afd736
 F src/complete.c cb14e06dbe79dee031031f0d9e686ff306afe07c
 F src/date.c 2373f20a91bec70e20e0e715520c8010d26ebb52
 F src/delete.c d979a250a47b9f52effa2998070810239e38db8b
-F src/expr.c 9033d8efb283311103a2859fc6aa9f85b894b6ba
+F src/expr.c 622c8d8e3cc8246a33aba30af5c166e4a3898c4b
 F src/fault.c 3638519d1e0b82bccfafcb9f5ff491918b28f8e1
 F src/func.c f2e0b55f13e678a5c5ff94f0f225ed0a995acba7
 F src/global.c 239d03b6dbae6c985deb2ffb54ab919debb9f8d7
@@ -135,21 +135,21 @@ F src/os_common.h 24525d8b7bce66c374dfc1810a6c9043f3359b60
 F src/os_os2.c e391fc95adc744bbdcefd4d11e3066998185a0a0
 F src/os_unix.c f1be99705e4542f01830ccea327eb773814f4eb9
 F src/os_win.c aefe9ee26430678a19a058a874e4e2bd91398142
-F src/pager.c 3b6625d32cd6f43c54c160f246545f9f26ba7668
-F src/pager.h 3778bea71dfb9658b6c94394e18db4a5b27e6ded
+F src/pager.c 62a0e18d5daacc9c0b3c79d446d411051fbfe6a2
+F src/pager.h 3b9c138d2e744b9d6e61d4c2742301e3bf464864
 F src/parse.y d0f76d2cb8d6883d5600dc20beb961a6022b94b8
-F src/pcache.c 504e6204124c4f90917ab1c0ea0a0ec549ed242f
+F src/pcache.c 3feb47f5ce4174570e7b76bd851faccf7df55e80
 F src/pcache.h 1457e4e7ef08f6964399d5c039afdece25071d54
 F src/pragma.c f5b271b090af7fcedd308d7c5807a5503f7a853d
 F src/prepare.c c197041e0c4770672cda75e6bfe10242f885e510
 F src/printf.c 785f87120589c1db672e37c6eb1087c456e6f84d
 F src/random.c 5c754319d38abdd6acd74601ee0105504adc508a
-F src/resolve.c e688f240bdacf4003047c2b023c3a4ee3a3eca98
+F src/resolve.c 3c9c04095fbf8a7f9be9fe71a07576d411c67f40
 F src/select.c 3db954ccabee38995b16013a390f15c3b07e1265
 F src/shell.c d83b578a8ccdd3e0e7fef4388a0887ce9f810967
 F src/sqlite.h.in 2373d1d70664f7fcd78e79af3c51792bb0a0753e
 F src/sqlite3ext.h 1e3887c9bd3ae66cb599e922824b04cd0d0f2c3e
-F src/sqliteInt.h 4f231eb750bf6901fdfa935c246a69d03c25d9b8
+F src/sqliteInt.h c66e9c22a9c7fcf32db52a14fcddaa4d87bf9559
 F src/sqliteLimit.h f435e728c6b620ef7312814d660a81f9356eb5c8
 F src/status.c 8caa772cd9310bc297280f7cf0ede4d69ed5b801
 F src/table.c 22744786199c9195720c15a7a42cb97b2e2728d8
@@ -623,7 +623,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 8fe234b2ca1292955162d38922a45c93004fb6ae
-R a701cf150f5456b72bfe44e79189c7f8
-U pweilbacher
-Z 824bd1e8b14485d4921b6a57c114c725
+P a861aa73c4913c468315e6b5c5a2706150082280
+R 869e35b1c300abbb971e58a073e89d71
+U drh
+Z c347f5c3495d908d0036ec2b3b0f97ed

diff --git a/manifest.uuid b/manifest.uuid
index 616dd544a2edf742584cb9fa2924354449609885..ba95e179f66913d09d2a73d4de67c1c90033c805 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a861aa73c4913c468315e6b5c5a2706150082280
\ No newline at end of file
+6de9c084fc533fbb22af6a4cd3e4e9a461b13876
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index 269e548c56db6b1ea3ac31791ca8b73a1c359812..a2da68125880c575fec0f05373ed70205c6b87de 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.500 2008/08/22 12:57:09 drh Exp $
+** $Id: btree.c,v 1.501 2008/08/22 17:34:45 drh Exp $
 **
 ** This file implements a external (disk-based) database using BTrees.
 ** See the header comment on "btreeInt.h" for additional information.
@@ -1299,7 +1299,6 @@ int sqlite3BtreeOpen(
     sqlite3PagerSetBusyhandler(pBt->pPager, &pBt->busyHdr);
     p->pBt = pBt;
   
-    /* sqlite3PagerSetDestructor(pBt->pPager, pageDestructor); */
     sqlite3PagerSetReiniter(pBt->pPager, pageReinit);
     pBt->pCursor = 0;
     pBt->pPage1 = 0;

diff --git a/src/expr.c b/src/expr.c
index 88a86cd63eefb9f67a44e711408e271a506cfd98..becc82a49e4f95aa868c8f7f743f221da981f077 100644 (file)
--- a/src/expr.c
+++ b/src/expr.c
@@ -12,7 +12,7 @@
 ** This file contains routines used for analyzing expressions and
 ** for generating VDBE code that evaluates expressions in SQLite.
 **
-** $Id: expr.c,v 1.390 2008/08/22 16:29:51 drh Exp $
+** $Id: expr.c,v 1.391 2008/08/22 17:34:45 drh Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -920,11 +920,6 @@ static int exprNodeIsConstant(Walker *pWalker, Expr *pExpr){
       testcase( pExpr->op==TK_AGG_COLUMN );
       pWalker->u.i = 0;
       return WRC_Abort;
-    case TK_IN:
-      if( pExpr->pSelect ){
-        pWalker->u.i = 0;
-        return WRC_Abort;
-      }
     default:
       return WRC_Continue;
   }

diff --git a/src/pager.c b/src/pager.c
index 5e7f8ff0ddcaeb764b8fdcbd843e717320a51fc5..aebf9f8a4f7aba845afa657d069bfd7a0e7058b6 100644 (file)
--- a/src/pager.c
+++ b/src/pager.c
@@ -18,7 +18,7 @@
 ** file simultaneously, or one process from reading the database while
 ** another is writing.
 **
-** @(#) $Id: pager.c,v 1.475 2008/08/22 16:22:17 danielk1977 Exp $
+** @(#) $Id: pager.c,v 1.476 2008/08/22 17:34:45 drh Exp $
 */
 #ifndef SQLITE_OMIT_DISKIO
 #include "sqliteInt.h"
@@ -1936,18 +1936,6 @@ void sqlite3PagerSetBusyhandler(Pager *pPager, BusyHandler *pBusyHandler){
   pPager->pBusyHandler = pBusyHandler;
 }
 
-/*
-** Set the destructor for this pager.  If not NULL, the destructor is called
-** when the reference count on each page reaches zero.  The destructor can
-** be used to clean up information in the extra segment appended to each page.
-**
-** The destructor is not called as a result sqlite3PagerClose().  
-** Destructors are only called by sqlite3PagerUnref().
-*/
-void sqlite3PagerSetDestructor(Pager *pPager, void (*xDesc)(DbPage*,int)){
-  pPager->xDestructor = xDesc;
-}
-
 /*
 ** Set the reinitializer for this pager.  If not NULL, the reinitializer
 ** is called when the content of a page in cache is restored to its original

diff --git a/src/pager.h b/src/pager.h
index 356466c9c2986d66014a7775e1cc24f50a670c3b..50bce8a3f565dea9f513057ace6d346d7c8f2d59 100644 (file)
--- a/src/pager.h
+++ b/src/pager.h
@@ -13,7 +13,7 @@
 ** subsystem.  The page cache subsystem reads and writes a file a page
 ** at a time and provides a journal for rollback.
 **
-** @(#) $Id: pager.h,v 1.79 2008/08/21 12:19:44 danielk1977 Exp $
+** @(#) $Id: pager.h,v 1.80 2008/08/22 17:34:45 drh Exp $
 */
 
 #ifndef _PAGER_H_
@@ -72,7 +72,6 @@ typedef struct PgHdr DbPage;
 */
 int sqlite3PagerOpen(sqlite3_vfs *, Pager **ppPager, const char*, void(*)(DbPage*), int,int,int);
 void sqlite3PagerSetBusyhandler(Pager*, BusyHandler *pBusyHandler);
-void sqlite3PagerSetDestructor(Pager*, void(*)(DbPage*,int));
 void sqlite3PagerSetReiniter(Pager*, void(*)(DbPage*,int));
 int sqlite3PagerSetPagesize(Pager*, u16*);
 int sqlite3PagerMaxPageCount(Pager*, int);

diff --git a/src/pcache.c b/src/pcache.c
index 20d9f632d0a75778f75ebfdab4f37d8b0db9ab61..84bf0994a78d3ed47e777e2c000b98e882b66e6f 100644 (file)
--- a/src/pcache.c
+++ b/src/pcache.c
@@ -11,7 +11,7 @@
 *************************************************************************
 ** This file implements that page cache.
 **
-** @(#) $Id: pcache.c,v 1.9 2008/08/22 17:09:50 danielk1977 Exp $
+** @(#) $Id: pcache.c,v 1.10 2008/08/22 17:34:45 drh Exp $
 */
 #include "sqliteInt.h"
 
@@ -440,6 +440,7 @@ static void pcachePageFree(PgHdr *p){
   pcacheFree(p);
 }
 
+#ifdef SQLITE_ENABLE_MEMORY_MANAGEMENT
 /*
 ** Return the number of bytes that will be returned to the heap when
 ** the argument is passed to pcachePageFree().
@@ -452,6 +453,7 @@ static int pcachePageSize(PgHdr *p){
   assert( p && p->pCache );
   return sqlite3MallocSize(p);
 }
+#endif
 
 /*
 ** Recycle a page from the global LRU list. If no page can be recycled, 

diff --git a/src/resolve.c b/src/resolve.c
index dbc97da3caaf1a217863c6d68d7c9de91db6813d..4d33c1a69faaf17a98dde4059379e18ac46bfb3b 100644 (file)
--- a/src/resolve.c
+++ b/src/resolve.c
@@ -14,7 +14,7 @@
 ** resolve all identifiers by associating them with a particular
 ** table and column.
 **
-** $Id: resolve.c,v 1.1 2008/08/20 16:35:10 drh Exp $
+** $Id: resolve.c,v 1.2 2008/08/22 17:34:45 drh Exp $
 */
 #include "sqliteInt.h"
 #include <stdlib.h>
@@ -1082,18 +1082,6 @@ int sqlite3ResolveExprNames(
   }
   return ExprHasProperty(pExpr, EP_Error);
 }
-int sqlite3ResolveExprListNames( 
-  NameContext *pNC,       /* Namespace to resolve expressions in. */
-  ExprList *pList         /* List of expressions to be analyzed. */
-){
-  int i;
-  struct ExprList_item *pItem;
-  if( pList==0 ) return 0;
-  for(i=pList->nExpr, pItem=pList->a; i>0; i--, pItem++){
-    if( sqlite3ResolveExprNames(pNC, pItem->pExpr) ) return 1;
-  }
-  return 0;
-}
 
 
 /*

diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 11af23e25e60d629482fdcb2edee556319401bff..d66036ba2738ea7585a58326b787c905f6b100bf 100644 (file)
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -11,7 +11,7 @@
 *************************************************************************
 ** Internal interface definitions for SQLite.
 **
-** @(#) $Id: sqliteInt.h,v 1.760 2008/08/22 12:30:52 drh Exp $
+** @(#) $Id: sqliteInt.h,v 1.761 2008/08/22 17:34:45 drh Exp $
 */
 #ifndef _SQLITEINT_H_
 #define _SQLITEINT_H_
@@ -2327,7 +2327,6 @@ void sqlite3ExpirePreparedStatements(sqlite3*);
 void sqlite3CodeSubselect(Parse *, Expr *, int);
 void sqlite3SelectPrep(Parse*, Select*, NameContext*);
 int sqlite3ResolveExprNames(NameContext*, Expr*);
-int sqlite3ResolveExprListNames(NameContext*, ExprList*);
 void sqlite3ResolveSelectNames(Parse*, Select*, NameContext*);
 int sqlite3ResolveOrderGroupBy(Parse*, Select*, ExprList*, const char*);
 void sqlite3ColumnDefault(Vdbe *, Table *, int);