From: dan Date: Fri, 23 Jul 2010 08:31:35 +0000 (+0000) Subject: Remove the unused Schema.db variable. X-Git-Tag: version-3.7.2~99 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1dcb9df43f6f94ec7cc42798c111817d67fe9d91;p=thirdparty%2Fsqlite.git Remove the unused Schema.db variable. FossilOrigin-Name: 430be657be68687c998f2f5f8dcd112bf26106be --- diff --git a/manifest b/manifest index 70a6dcca86..dde6f5bb81 100644 --- a/manifest +++ b/manifest @@ -1,8 +1,5 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -C Add\sevidence\smarks\sto\sthe\swhere.c\ssource\sfile.\s\sComment\sonly\s-\sno\scode\schanges. -D 2010-07-22T22:40:04 +C Remove\sthe\sunused\sSchema.db\svariable. +D 2010-07-23T08:31:36 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 F Makefile.in ec08dc838fd8110fe24c92e5130bcd91cbb1ff2e F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 @@ -175,7 +172,7 @@ F src/select.c 4903ff1bbd08b55cbce00ea43c645530de41b362 F src/shell.c fd4ccdb37c3b68de0623eb938a649e0990710714 F src/sqlite.h.in 2585fc82c922f2772e201e60a76d5fd1ca18370e F src/sqlite3ext.h 69dfb8116af51b84a029cddb3b35062354270c89 -F src/sqliteInt.h cb9ca3291acfd3f10859bcc4b2bb463e6e874939 +F src/sqliteInt.h e0d3c223fe5e43693d4b7683b3df6b6e97179ffd F src/sqliteLimit.h 196e2f83c3b444c4548fc1874f52f84fdbda40f3 F src/status.c e2ad9f18c16209dab501e26020590fcebb2b751b F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e @@ -229,7 +226,7 @@ F src/vdbeaux.c 7f99c1f00e4b31e8b28d8a87ecc2322bb46ae99c F src/vdbeblob.c 258a6010ba7a82b72b327fb24c55790655689256 F src/vdbemem.c 5e579abf6532001dfbee0e640dc34eae897a9807 F src/vdbetrace.c 864cef96919323482ebd9986f2132435115e9cc2 -F src/vtab.c a0f8a40274e4261696ef57aa806de2776ab72cda +F src/vtab.c 477f3dd1ccfabc7a4d930e934cd1b9604259fcfb F src/wal.c 0925601f3299c2941a67c9cfff41ee710f70ca82 F src/wal.h 906c85760598b18584921fe08008435aa4eeeeb2 F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f @@ -841,14 +838,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f -P 241f7bd190329fa02ca428651072a4a206132eab -R 58c9336648eb3ce384b25cb1a31df81e -U drh -Z 05893823ee3052eca076f0070c9d2946 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.6 (GNU/Linux) - -iD8DBQFMSMjIoxKgR168RlERAotrAJwKX5P9bHGJ1mEEtboK6UGGgyWioQCgi8M5 -Adn9/cSJE8bR6eO9+n8ekCg= -=4n2n ------END PGP SIGNATURE----- +P f3f9e8e5bb90cc36e0d63a7289a8acf534c5fa2a +R 3b4affe94bacb453466cd5c684e41e75 +U dan +Z 440f3d00aab51cca2a0728ba4051640b diff --git a/manifest.uuid b/manifest.uuid index 76fb7d733e..adb3b49209 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -f3f9e8e5bb90cc36e0d63a7289a8acf534c5fa2a \ No newline at end of file +430be657be68687c998f2f5f8dcd112bf26106be \ No newline at end of file diff --git a/src/sqliteInt.h b/src/sqliteInt.h index 24394aebbe..3060f07487 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -661,14 +661,6 @@ struct Db { /* ** An instance of the following structure stores a database schema. -** -** If there are no virtual tables configured in this schema, the -** Schema.db variable is set to NULL. After the first virtual table -** has been added, it is set to point to the database connection -** used to create the connection. Once a virtual table has been -** added to the Schema structure and the Schema.db variable populated, -** only that database connection may use the Schema to prepare -** statements. */ struct Schema { int schema_cookie; /* Database schema version number for this file */ @@ -681,9 +673,6 @@ struct Schema { u8 enc; /* Text encoding used by this database */ u16 flags; /* Flags associated with this schema */ int cache_size; /* Number of pages to use in the cache */ -#ifndef SQLITE_OMIT_VIRTUALTABLE - sqlite3 *db; /* "Owner" connection. See comment above */ -#endif }; /* diff --git a/src/vtab.c b/src/vtab.c index 24e922e8dd..d238460241 100644 --- a/src/vtab.c +++ b/src/vtab.c @@ -393,7 +393,6 @@ void sqlite3VtabFinishParse(Parse *pParse, Token *pEnd){ assert( pTab==pOld ); /* Malloc must have failed inside HashInsert() */ return; } - pSchema->db = pParse->db; pParse->pNewTable = 0; } }