diff options
| author | dan <dan@noemail.net> | 2014-03-06 12:36:26 +0000 |
|---|---|---|
| committer | dan <dan@noemail.net> | 2014-03-06 12:36:26 +0000 |
| commit | 0df163a9f06f402bc985b6d53fe1257245b12b01 (patch) | |
| tree | c76f23d8e4a467c0a98b0c0e80cc2f25fdb00420 | |
| parent | 378d01aa949d5b49b9f31e91909d4fe5ba2b598b (diff) | |
| download | sqlite-0df163a9f06f402bc985b6d53fe1257245b12b01.tar.gz sqlite-0df163a9f06f402bc985b6d53fe1257245b12b01.zip | |
Remove a branch that is never taken from where.c.
FossilOrigin-Name: 4a4997221f3d61c1411a993053b40c787beea736
| -rw-r--r-- | manifest | 14 | ||||
| -rw-r--r-- | manifest.uuid | 2 | ||||
| -rw-r--r-- | src/where.c | 2 |
3 files changed, 9 insertions, 9 deletions
@@ -1,5 +1,5 @@ -C Cosmetic\schange\sto\sthe\sshell\sin-memory\sdatabase\swarning\sto\sskip\scoloring\sthe\strailing\speriod. -D 2014-03-06T02:15:42.988 +C Remove\sa\sbranch\sthat\sis\snever\staken\sfrom\swhere.c. +D 2014-03-06T12:36:26.240 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -290,7 +290,7 @@ F src/vtab.c 21b932841e51ebd7d075e2d0ad1415dce8d2d5fd F src/wal.c 76e7fc6de229bea8b30bb2539110f03a494dc3a8 F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4 F src/walker.c 11edb74d587bc87b33ca96a5173e3ec1b8389e45 -F src/where.c 2269342f82ea97596564bdc981c362a5177b72c5 +F src/where.c 95d30485879122acc5284d4523e01399b23b6148 F src/whereInt.h 921f935af8b684ffb49705610bda7284db1db138 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2 @@ -1155,7 +1155,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff -P b83cfe899d84fe9d61540e9984321ca30401638c -R a229689d692fc13174e0ca3780072f0f -U mistachkin -Z 057b46befe5b696e1f097c5fbeb7d34a +P c87d8e07ec596d5f0ef3003cfeb226d4b7c49549 +R 8a41ab31fe82e4eb8dd3f6f960d87359 +U dan +Z 9504b4a4d2685ecc17b4e7b160b2fd5f diff --git a/manifest.uuid b/manifest.uuid index adad07e5f..0a317e327 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -c87d8e07ec596d5f0ef3003cfeb226d4b7c49549
\ No newline at end of file +4a4997221f3d61c1411a993053b40c787beea736
\ No newline at end of file diff --git a/src/where.c b/src/where.c index c29c94ae0..963878d00 100644 --- a/src/where.c +++ b/src/where.c @@ -3057,13 +3057,13 @@ static Bitmask codeOneLoopStart( pRangeEnd = pLoop->aLTerm[j++]; nExtraReg = 1; if( pRangeStart==0 - && (pRangeEnd->wtFlags & TERM_VNULL)==0 && (j = pIdx->aiColumn[nEq])>=0 && pIdx->pTable->aCol[j].notNull==0 ){ bSeekPastNull = 1; } } + assert( pRangeEnd==0 || (pRangeEnd->wtFlags & TERM_VNULL)==0 ); /* Generate code to evaluate all constraint terms using == or IN ** and store the values of those terms in an array of registers |