From ec8450f6cbafdbdc31bdc286c7d99783b193b998 Mon Sep 17 00:00:00 2001 From: danielk1977 Date: Sat, 19 Jun 2004 09:35:36 +0000 Subject: [PATCH] Remove the unused 'next_cookie' mechanism. (CVS 1634) FossilOrigin-Name: c94a9759ca6346a8c32f388a7aa1f0f139d6abc2 --- manifest | 20 ++++++++++---------- manifest.uuid | 2 +- src/build.c | 3 +-- src/main.c | 4 +--- src/sqliteInt.h | 3 +-- src/vdbe.c | 4 ++-- src/vdbeaux.c | 2 +- 7 files changed, 17 insertions(+), 21 deletions(-) diff --git a/manifest b/manifest index 7481162920..7187d7b463 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Make\ssure\sATTACH\sand\sDETACH\sfail\sif\sa\stransaction\sis\sactive.\s(CVS\s1633) -D 2004-06-19T09:08:16 +C Remove\sthe\sunused\s'next_cookie'\smechanism.\s(CVS\s1634) +D 2004-06-19T09:35:36 F Makefile.in d69d53c543518c1572ee0a8e8723d7e00bdb2266 F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd @@ -28,7 +28,7 @@ F src/attach.c 293da1e8e3ea6e9244bb3d744da930606fbb4ab0 F src/auth.c 204e1e9c45e64315589bc8b62cba5d9de29b6a3c F src/btree.c 0cf8a52a57a7eb13d50719114ee1fa353e89d7d3 F src/btree.h 32f96abef464cf8765b23ca669acfe90d191fcc5 -F src/build.c 239bd93949db1ddc277f26c27e0d613ff5fe16c7 +F src/build.c d7827169529c76cb86760bc1bc06a931c4ff6c8c F src/date.c b3e8b2bef1e3f2ce24e5b057203036defb18c3f1 F src/delete.c a5191011b7429dff939df631b8bdcc1714b8d7aa F src/encode.c a876af473d1d636faa3dca51c7571f2e007eea37 @@ -38,7 +38,7 @@ F src/hash.c 440c2f8cb373ee1b4e13a0988489c7cd95d55b6f F src/hash.h 762d95f1e567664d1eafc1687de755626be962fb F src/insert.c 1428887f4a7515a7d34e82aaeb76297c79ba378b F src/legacy.c ad23746f15f67e34577621b1875f639c94839e1f -F src/main.c 5dc5012e1098a2b05decbdbc504815024737e436 +F src/main.c 96387fc23db30d7ce64f62e95a229c3dd9aff397 F src/md5.c 7ae1c39044b95de2f62e066f47bb1deb880a1070 F src/os.h 1cb5f0293a30288451fe3c0c73815cf208212ed1 F src/os_common.h ba1b7306e16e2091718f2c48db0fe6c1d7a31bb8 @@ -57,7 +57,7 @@ F src/random.c eff68e3f257e05e81eae6c4d50a51eb88beb4ff3 F src/select.c 91570af7f13d1c5584f3b711676e1226ee12194e F src/shell.c 24b641700c9d90f361fcfa4f432c5b4aff704e6d F src/sqlite.h.in c34414b9f5330f875e26a69fe685e38ca45f11b9 -F src/sqliteInt.h b01c438b31132816d8a4167a45c8b7dab4ff79d4 +F src/sqliteInt.h 6c141ab926097c9671e22641fbb70e24c58b883c F src/table.c af14284fa36c8d41f6829e3f2819dce07d3e2de2 F src/tclsqlite.c ddef9b18271fb46344d3d35446bd7c001465a69a F src/test1.c ee426e026ad9223483e7a84bb68849fc6e9f542e @@ -71,11 +71,11 @@ F src/update.c f9a03233577e0c3d57234d1957963875fc941da2 F src/utf.c 3a2596013e4b9582d075ca742de7f067ff7dee95 F src/util.c 1b3743413e11cae51a899dc03fa9b829a3a1f160 F src/vacuum.c fcb930215a3f6c50087300782555f61ad11dd80c -F src/vdbe.c 2a0e908e46ea6822f215cb0f35ec31f5c2832629 +F src/vdbe.c 324ad6157f9bd0a770be70a4e7dca2cb0d27bd82 F src/vdbe.h 46f74444a213129bc4b5ce40124dd8ed613b0cde F src/vdbeInt.h 54af2e00301cde7573b86ea8a9b29a2152e762f7 F src/vdbeapi.c 1601fb2d015fc88ce3dd6a6a50cf44b6419fdbbf -F src/vdbeaux.c b3c13f05f62ed9269d4919d1d05a1d6ba44448e3 +F src/vdbeaux.c 82074da25adb94aabd80a407b32f91fa9389baca F src/vdbemem.c 9359c53386e070fea9f5403cab0c6f0cfe36496b F src/where.c 6507074d8ce3f78e7a4cd33f667f11e62020553e F test/all.test 569a92a8ee88f5300c057cc4a8f50fbbc69a3242 @@ -225,7 +225,7 @@ F www/tclsqlite.tcl 19191cf2a1010eaeff74c51d83fd5f5a4d899075 F www/vdbe.tcl 59288db1ac5c0616296b26dce071c36cb611dfe9 F www/version3.tcl af528563442e3039928f9018327a18157e53a44f F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4 -P 728d57ff5517a51c3aad4ba95525b1aa2065bd19 -R 517c1f3b253885c349ae56132b2c980e +P c49d8bdc3e1172a283f7aaf208fbb9096acd5ab6 +R 755eee630e44befaacb68cbca6d80195 U danielk1977 -Z 1e7b9e1153ac7c95d463a3ea969f0f7b +Z d4f69a71781da481372996f735f858f8 diff --git a/manifest.uuid b/manifest.uuid index df7f0fcb4a..5bf3dcbe75 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -c49d8bdc3e1172a283f7aaf208fbb9096acd5ab6 \ No newline at end of file +c94a9759ca6346a8c32f388a7aa1f0f139d6abc2 \ No newline at end of file diff --git a/src/build.c b/src/build.c index 0d1cb496b5..3c082699cd 100644 --- a/src/build.c +++ b/src/build.c @@ -23,7 +23,7 @@ ** ROLLBACK ** PRAGMA ** -** $Id: build.c,v 1.223 2004/06/19 02:22:10 danielk1977 Exp $ +** $Id: build.c,v 1.224 2004/06/19 09:35:36 danielk1977 Exp $ */ #include "sqliteInt.h" #include @@ -327,7 +327,6 @@ void sqlite3RollbackInternalChanges(sqlite *db){ ** This routine is called when a commit occurs. */ void sqlite3CommitInternalChanges(sqlite *db){ - db->aDb[0].schema_cookie = db->next_cookie; db->flags &= ~SQLITE_InternChanges; } diff --git a/src/main.c b/src/main.c index 797702f17b..2c23bda562 100644 --- a/src/main.c +++ b/src/main.c @@ -14,7 +14,7 @@ ** other files are for internal use by SQLite and should not be ** accessed by users of the library. ** -** $Id: main.c,v 1.229 2004/06/19 08:18:12 danielk1977 Exp $ +** $Id: main.c,v 1.230 2004/06/19 09:35:37 danielk1977 Exp $ */ #include "sqliteInt.h" #include "os.h" @@ -275,8 +275,6 @@ static int sqlite3InitOne(sqlite *db, int iDb, char **pzErrMsg){ } if( db->safety_level==0 ) db->safety_level = 2; - /* FIX ME: Every struct Db will need a next_cookie */ - db->next_cookie = meta[0]; db->file_format = meta[1]; if( db->file_format==0 ){ /* This happens if the database was initially empty */ diff --git a/src/sqliteInt.h b/src/sqliteInt.h index 87d1fba8b2..bc09a75a2e 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -11,7 +11,7 @@ ************************************************************************* ** Internal interface definitions for SQLite. ** -** @(#) $Id: sqliteInt.h,v 1.291 2004/06/19 08:18:19 danielk1977 Exp $ +** @(#) $Id: sqliteInt.h,v 1.292 2004/06/19 09:35:37 danielk1977 Exp $ */ #include "config.h" #include "sqlite3.h" @@ -392,7 +392,6 @@ struct sqlite { u8 file_format; /* What file format version is this database? */ u8 safety_level; /* How aggressive at synching data to disk */ u8 temp_store; /* 1=file, 2=memory, 0=compile-time default */ - int next_cookie; /* Next value of aDb[0].schema_cookie */ int cache_size; /* Number of pages to use in the cache */ int nTable; /* Number of tables in the database */ BusyHandler busyHandler; /* Busy callback */ diff --git a/src/vdbe.c b/src/vdbe.c index ae7a38c9a6..2476c265a9 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.379 2004/06/18 04:24:55 danielk1977 Exp $ +** $Id: vdbe.c,v 1.380 2004/06/19 09:35:37 danielk1977 Exp $ */ #include "sqliteInt.h" #include "os.h" @@ -4585,7 +4585,7 @@ default: { char zBuf[100]; sqlite3VdbeMemPrettyPrint(&pTos[i], zBuf, 100); fprintf(p->trace, " "); - fprintf(p->trace, zBuf); + fprintf(p->trace, "%s", zBuf); } } if( rc!=0 ) fprintf(p->trace," rc=%d",rc); diff --git a/src/vdbeaux.c b/src/vdbeaux.c index e4f6434a42..dfdbfde46f 100644 --- a/src/vdbeaux.c +++ b/src/vdbeaux.c @@ -1271,7 +1271,7 @@ int sqlite3VdbeReset(Vdbe *p, char **pzErrMsg){ if( p->rc!=SQLITE_OK ){ sqlite3RollbackInternalChanges(db); }else if( db->flags & SQLITE_InternChanges ){ - db->flags &= ~SQLITE_InternChanges; + sqlite3CommitInternalChanges(db); } if( (p->magic==VDBE_MAGIC_RUN && p->pc>=0) || p->magic==VDBE_MAGIC_HALT ){