Remove a branch that is probably unreachable, and which adds no value.

FossilOrigin-Name: 9acc72381ccd5e36f3ffdf7e7fbefc5a15701eb4

diff --git a/manifest b/manifest
index 1e60a984608d8b76bd84a7d911cbf127215d7832..000de47de4941989e7994e280ea8ab9b5dbb1659 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sharmless\scompiler\swarnings\sin\sthe\sUPDATE\scode\sgenerator.
-D 2017-01-12T16:21:54.480
+C Remove\sa\sbranch\sthat\sis\sprobably\sunreachable,\sand\swhich\sadds\sno\svalue.
+D 2017-01-12T19:10:55.750
 F Makefile.in 41bd4cad981487345c4a84081074bcdb876e4b2e
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc b8ca53350ae545e3562403d5da2a69cec79308da
@@ -331,7 +331,7 @@ F src/auth.c 930b376a9c56998557367e6f7f8aaeac82a2a792
 F src/backup.c faf17e60b43233c214aae6a8179d24503a61e83b
 F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
 F src/btmutex.c 0e9ce2d56159b89b9bc8e197e023ee11e39ff8ca
-F src/btree.c 5f8642134a2b56d0909f6196d7a1b0731cf4188a
+F src/btree.c 69966fb2c574954cd3216f09407c9a02c52d3bd7
 F src/btree.h e6d352808956ec163a17f832193a3e198b3fb0ac
 F src/btreeInt.h 10c4b77c2fb399580babbcc7cf652ac10dba796e
 F src/build.c 9e799f1edd910dfa8a0bc29bd390d35d310596af
@@ -1544,7 +1544,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 bddf39562d08e259c43dd59b82afb62fe0eb2eef
-R c1f97b0b1d9fb4e22bf29bd06fe30297
+P 385db266673abaf7013ffad09b28014c246547ef
+R fc07cbd5c2e564fa0b0693e0166fd1a4
 U drh
-Z a2b5fe338be7534e4379cc3897438f5d
+Z 1662f62ac3b6c5068ca23b30e30b82dc

diff --git a/manifest.uuid b/manifest.uuid
index da8dc7b7b99722b9c3584b76de527764005e8962..644e2b84c1f4c2eaf2e5719251b5081d72ca7351 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-385db266673abaf7013ffad09b28014c246547ef
\ No newline at end of file
+9acc72381ccd5e36f3ffdf7e7fbefc5a15701eb4
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index c635e15718315de05d9e58b0e088fa20b654a53d..7b568676468f6f1a9a5bc2e11ddf3330b24a71be 100644 (file)
--- a/src/btree.c
+++ b/src/btree.c
@@ -8124,7 +8124,7 @@ int sqlite3BtreeInsert(
     pCur->eState = CURSOR_INVALID;
     if( (flags & BTREE_SAVEPOSITION) && rc==SQLITE_OK ){
       rc = moveToRoot(pCur);
-      if( pCur->pKeyInfo && rc==SQLITE_OK ){
+      if( pCur->pKeyInfo ){
         assert( pCur->pKey==0 );
         pCur->pKey = sqlite3Malloc( pX->nKey );
         if( pCur->pKey==0 ){