From: drh <drh@noemail.net>
Date: Tue, 28 May 2013 17:25:48 +0000 (+0000)
Subject: Remove the obsolete and unused sqlite3.inTrans field.
X-Git-Tag: version-3.8.0~152
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4580d759fba8bbed2adf8c89dd8b11eb50b792fc;p=thirdparty%2Fsqlite.git

Remove the obsolete and unused sqlite3.inTrans field.

FossilOrigin-Name: c3381cd4957013d46075996c3b865177c888d2a8
---

diff --git a/manifest b/manifest
index 2a0f7b44c9..95092b7d62 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Many\ssmall\sharmless\scomment\schanges.\s\sRemoval\sof\sobsolete\scomments\sand\nfixing\smisspelled\swords.\s\sNo\schanges\sto\scode.
-D 2013-05-28T12:11:54.059
+C Remove\sthe\sobsolete\sand\sunused\ssqlite3.inTrans\sfield.
+D 2013-05-28T17:25:48.228
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in f6b58b7bdf6535f0f0620c486dd59aa4662c0b4f
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -183,7 +183,7 @@ F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
 F src/legacy.c 0df0b1550b9cc1f58229644735e317ac89131f12
 F src/lempar.c cdf0a000315332fc9b50b62f3b5e22e080a0952b
 F src/loadext.c c48f7f3f170e502fe0cc20748e03c6e0b5a016c2
-F src/main.c fa68271882d95bd8a7f7d15f55f9da46d74abda5
+F src/main.c cc952f324f648966a5252c0d7f14848c027921d9
 F src/malloc.c fe085aa851b666b7c375c1ff957643dc20a04bf6
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 F src/mem1.c 437c7c4af964895d4650f29881df63535caaa1fa
@@ -219,7 +219,7 @@ F src/shell.c 9a18124ff209ca308d786c99a466e8e270193ff3
 F src/sqlite.h.in 5a5a22a9b192d81a9e5dee00274e3a0484c4afb1
 F src/sqlite3.rc fea433eb0a59f4c9393c8e6d76a6e2596b1fe0c0
 F src/sqlite3ext.h d936f797812c28b81b26ed18345baf8db28a21a5
-F src/sqliteInt.h e8306784f8d637de29c2e298fbe2b7094ba00abf
+F src/sqliteInt.h 46fb17f604ce941551fe64c342dbeb4dbed3edaa
 F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
 F src/status.c bedc37ec1a6bb9399944024d63f4c769971955a9
 F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@ -1090,7 +1090,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
-P a72f50ef76a5f8a3d5a6a758ec88009c12127f06
-R 6ca5e3287bbaf2adf50d2b284dfdb3eb
+P a0d5cc9315dc6e9ef7dee4c3dfabf4e562d64376
+R c49ad2144df2af701b43a13836fb7ffd
 U drh
-Z 573ed86ebe83cec277b9575597398841
+Z a2a3fdfb6c263f907a8472ce368de001
diff --git a/manifest.uuid b/manifest.uuid
index e0b4fedd9a..d3fd1176ca 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a0d5cc9315dc6e9ef7dee4c3dfabf4e562d64376
\ No newline at end of file
+c3381cd4957013d46075996c3b865177c888d2a8
\ No newline at end of file
diff --git a/src/main.c b/src/main.c
index 24cfb4b983..9fa2defb14 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1024,7 +1024,7 @@ void sqlite3RollbackAll(sqlite3 *db, int tripCode){
         inTrans = 1;
       }
       sqlite3BtreeRollback(p, tripCode);
-      db->aDb[i].inTrans = 0;
+//      db->aDb[i].inTrans = 0;
     }
   }
   sqlite3VtabRollback(db);
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 713933c7aa..4482ed69a8 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -748,7 +748,6 @@ typedef struct WhereLevel WhereLevel;
 struct Db {
   char *zName;         /* Name of this database */
   Btree *pBt;          /* The B*Tree structure for this database file */
-  u8 inTrans;          /* 0: not writable.  1: Transaction.  2: Checkpoint */
   u8 safety_level;     /* How aggressive at syncing data to disk */
   Schema *pSchema;     /* Pointer to database schema (possibly shared) */
 };