From: drh <drh@noemail.net>
Date: Mon, 13 Jun 2016 12:51:20 +0000 (+0000)
Subject: Fix an incorrect assert() in the btree logic.
X-Git-Tag: version-3.14.0~98
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=debaa86c1c3b73de2b1fe4dad5009c717de5b980;p=thirdparty%2Fsqlite.git

Fix an incorrect assert() in the btree logic.

FossilOrigin-Name: fcf6114be94b260641e7c78a58db16a31ac5ab35
---

diff --git a/manifest b/manifest
index b15af5f081..87f091e147 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sthe\s"onecolumn"\sand\s"exists"\smethods\sof\sthe\sTCL\sinterface\sso\sthat\sthey\nwork\sin\scombination\swith\sthe\s"profile"\scallback.
-D 2016-06-13T12:34:38.095
+C Fix\san\sincorrect\sassert()\sin\sthe\sbtree\slogic.
+D 2016-06-13T12:51:20.365
 F Makefile.in f3f7d2060ce03af4584e711ef3a626ef0b1d6340
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 50149765ef72f4e652b9a0f1f6462c4784bb9423
@@ -326,7 +326,7 @@ F src/auth.c b56c78ebe40a2110fd361379f7e8162d23f92240
 F src/backup.c 6df65fdd569c901a418887a1a76f82ec35044556
 F src/bitvec.c 3ee4c8b2c94ed3a7377256e18199e6ff5cf33f63
 F src/btmutex.c bc87dd3b062cc26edfe79918de2200ccb8d41e73
-F src/btree.c 2781fb1db1e46390a9c27a2162395f371577ac66
+F src/btree.c 0621247619df15790f7ed5f14926cfb3925c10b1
 F src/btree.h 2107a2630e02c8cba58bb12ce14e731e734ea29c
 F src/btreeInt.h c18b7d2a3494695133e4e60ee36061d37f45d9a5
 F src/build.c d1fdfd7ab8f5447e494ef15825973bf0719527c6
@@ -1501,7 +1501,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 53a1e5d51304cb3de700c1807a2c945a40240576
-R 728aa3483f448a04bb6de7c432f92c81
+P d362ba157f993fc74a590cf15a9a2fa589278dd7
+R 8b591288ef08b6290802dd112ec0668a
 U drh
-Z f275382679f329597f4cef7fe1c1d3e9
+Z 9ef02259ea1748db703c32ac6cd57aa7
diff --git a/manifest.uuid b/manifest.uuid
index 17751de4e1..16b994508c 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d362ba157f993fc74a590cf15a9a2fa589278dd7
\ No newline at end of file
+fcf6114be94b260641e7c78a58db16a31ac5ab35
\ No newline at end of file
diff --git a/src/btree.c b/src/btree.c
index 3a95edf007..f37199276f 100644
--- a/src/btree.c
+++ b/src/btree.c
@@ -5070,7 +5070,7 @@ int sqlite3BtreeMovetoUnpacked(
   assert( sqlite3_mutex_held(pCur->pBtree->db->mutex) );
   assert( pRes );
   assert( (pIdxKey==0)==(pCur->pKeyInfo==0) );
-  assert( (pIdxKey==0)==(pCur->curIntKey!=0) || pCur->eState!=CURSOR_VALID );
+  assert( pCur->eState!=CURSOR_VALID || (pIdxKey==0)==(pCur->curIntKey!=0) );
 
   /* If the cursor is already positioned at the point we are trying
   ** to move to, then just return without doing any work */