diff options
| author | drh <drh@noemail.net> | 2016-04-05 14:01:34 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2016-04-05 14:01:34 +0000 |
| commit | 868f0398e4f4bf40e66a3802733e87d06c2cde0a (patch) | |
| tree | c94ba3664df116b71774f5d89ea34611517df3fa | |
| parent | 1c715f67b9765e14d06288a1deb890170972ae4a (diff) | |
| download | sqlite-868f0398e4f4bf40e66a3802733e87d06c2cde0a.tar.gz sqlite-868f0398e4f4bf40e66a3802733e87d06c2cde0a.zip | |
Remove an unnecessary conditional from the index builder.
FossilOrigin-Name: 87e5f5a6c60e37e943b3ce80617e81b09852515e
| -rw-r--r-- | manifest | 12 | ||||
| -rw-r--r-- | manifest.uuid | 2 | ||||
| -rw-r--r-- | src/build.c | 2 |
3 files changed, 8 insertions, 8 deletions
@@ -1,5 +1,5 @@ -C Use\sSQLITE_WITHIN()\sfor\spointer\srange\scomparisons\sin\ssome\stesting\scode. -D 2016-04-05T13:35:43.174 +C Remove\san\sunnecessary\sconditional\sfrom\sthe\sindex\sbuilder. +D 2016-04-05T14:01:34.379 F Makefile.in e812bb732d7af01baa09f1278bd4f4a2e3a09449 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc fe57d7e3e74fa383fd01ced796c0ffd966fc094a @@ -322,7 +322,7 @@ F src/btmutex.c bc87dd3b062cc26edfe79918de2200ccb8d41e73 F src/btree.c 556203aab543e91f4e20cc273a507ed712c8da26 F src/btree.h a5008b9afe56e8e54ade6c436a910f112defcca9 F src/btreeInt.h c18b7d2a3494695133e4e60ee36061d37f45d9a5 -F src/build.c 39faaaeecb77eb3936d4bd5024e865e3836ca323 +F src/build.c ab763de47337f1acf03de6b36cbc13c90d20b932 F src/callback.c 2e76147783386374bf01b227f752c81ec872d730 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e F src/ctime.c 60e135af364d777a9ab41c97e5e89cd224da6198 @@ -1482,7 +1482,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 85b979319bcb8ec301ae39b36ad60348e4515be7 -R 78bf202733e4247e84509df93eee1af7 +P 7cacf4e954c8de5af5efb56d8271a5ac1edc1c04 +R 5ad558ecd8aa9ab49f6924d29c53367a U drh -Z b9b3193def70d2175e83a878eda9a91d +Z 440953881a474ce081fa2537f4e8dbc0 diff --git a/manifest.uuid b/manifest.uuid index b976ec3fb..43b1d36eb 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -7cacf4e954c8de5af5efb56d8271a5ac1edc1c04
\ No newline at end of file +87e5f5a6c60e37e943b3ce80617e81b09852515e
\ No newline at end of file diff --git a/src/build.c b/src/build.c index d4d0c173c..41ded1f8e 100644 --- a/src/build.c +++ b/src/build.c @@ -2786,7 +2786,7 @@ static void sqlite3RefillIndex(Parse *pParse, Index *pIndex, int memRootPage){ addr1 = sqlite3VdbeAddOp2(v, OP_SorterSort, iSorter, 0); VdbeCoverage(v); assert( pKey!=0 || db->mallocFailed || pParse->nErr ); - if( IsUniqueIndex(pIndex) && pKey!=0 ){ + if( IsUniqueIndex(pIndex) /*&& pKey!=0*/ ){ int j2 = sqlite3VdbeCurrentAddr(v) + 3; sqlite3VdbeGoto(v, j2); addr2 = sqlite3VdbeCurrentAddr(v); |