Remove an unused #define and add an assert(), both associated with WITH logic.

FossilOrigin-Name: a06235e0f6aa1e8fefa3f2873ee035eac9dac750
This commit is contained in:
drh 2014-01-20 14:58:55 +00:00
parent 7f3068aa83
commit c25e2ebc01
4 changed files with 10 additions and 10 deletions

View File

@ -1,5 +1,5 @@
C Do\snot\srun\sthe\stests\sin\swith2.test\swith\sSQLITE_OMIT_CTE\sbuilds.
D 2014-01-20T14:17:08.203
C Remove\san\sunused\s#define\sand\sadd\san\sassert(),\sboth\sassociated\swith\sWITH\slogic.
D 2014-01-20T14:58:55.056
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@ -219,12 +219,12 @@ F src/printf.c 85d07756e45d7496d19439dcae3e6e9e0090f269
F src/random.c d10c1f85b6709ca97278428fd5db5bbb9c74eece
F src/resolve.c 7eda9097b29fcf3d2b42fdc17d1de672134e09b6
F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
F src/select.c 170a9f9e2c89b3d336d8c39d67690f3c7a06aaaf
F src/select.c a27ac21844df3123b7c1e89d79cd7034d4eb0e8e
F src/shell.c 9f3bc02a658b8f61d2cbe60cfc482f660c1c6c48
F src/sqlite.h.in eed7f7d66a60daaa7b4a597dcd9bad87aad9611b
F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
F src/sqliteInt.h 9600eeb486c274fbdb815d040e4a7f262b7317e1
F src/sqliteInt.h 99fd628541e420b98fc52072635e8ba431706250
F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@ -1151,7 +1151,7 @@ F tool/vdbe-compress.tcl 0cf56e9263a152b84da86e75a5c0cdcdb7a47891
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
P 679eff8759aa25368b977c0d26b78a9fcd9486f5
R 4f2132a97fe1dbb0dda85feb1706370a
U dan
Z 185238e927f243f40ec02c5fcc28d90b
P 8a973912e98c9b1bb9d3f914527d35c1e7f2011a
R bcd03400ea7bd2e959020317f5125b8b
U drh
Z f5ee43186682e26d4e29624d49787797

View File

@ -1 +1 @@
8a973912e98c9b1bb9d3f914527d35c1e7f2011a
a06235e0f6aa1e8fefa3f2873ee035eac9dac750

View File

@ -3595,6 +3595,7 @@ static int withExpand(
return SQLITE_ERROR;
}
assert( pFrom->pTab==0 );
pFrom->pTab = pTab = sqlite3DbMallocZero(db, sizeof(Table));
if( pTab==0 ) return WRC_Abort;
pTab->nRef = 1;

View File

@ -1437,7 +1437,6 @@ struct Table {
#define TF_Autoincrement 0x08 /* Integer primary key is autoincrement */
#define TF_Virtual 0x10 /* Is a virtual table */
#define TF_WithoutRowid 0x20 /* No rowid used. PRIMARY KEY is the key */
#define TF_Recursive 0x40 /* Recursive reference within CTE */
/*