Remove a NEVER() from a branch that is now reachable during OOM faults.

FossilOrigin-Name: 18bdcb05c26860643f53a6b9e85f84109a3ebe5a

diff --git a/manifest b/manifest
index c28e8a7063f90aafb48eeec4a015f3d73becdd27..efb60bfaa3d9da24ce21542d2014b37c9c7cb966 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Optimizations\sto\sthe\ssqlite3BtreeMovetoUnpacked()\sroutine\sin\sstorage\sengine\nmaking\sit\sabout\s17.8%\sfaster,\swhich\sin\sturn\smakes\sSQLite\sover\s1.2%\sfaster\noverall.
-D 2013-11-25T20:50:23.619
+C Remove\sa\sNEVER()\sfrom\sa\sbranch\sthat\sis\snow\sreachable\sduring\sOOM\sfaults.
+D 2013-11-25T21:41:24.083
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in e1a9b4258bbde53f5636f4e238c65b7e11459e2b
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -166,7 +166,7 @@ F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
 F src/backup.c 1809a7caa2504233bdddd12f5018422421789537
 F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
 F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
-F src/btree.c c308e64d89de5ea87e5538f7380af4477892e067
+F src/btree.c ec8a4dcac5c1ec1ba9705b8c5a13e62167958317
 F src/btree.h a61ddebc78c66795a2b93181321a116746302cc9
 F src/btreeInt.h f038e818bfadf75afbd09819ed93c26a333d39e0
 F src/build.c 07054d45319953e54a89d726e589a423e9c1c590
@@ -1142,8 +1142,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
-P 8f3c767a30c552548ead104ca125f182ce4849ad b48c4e402125fb8d2208d358f6e9bbc351f3a49d
-R 5bcbc7e134df92bc8848f497a4ca3642
-T +closed b48c4e402125fb8d2208d358f6e9bbc351f3a49d
+P 032e89934f36de10652d3454a0065a337827221a
+R 542bd751b886b00603f8e8e48c8170e2
 U drh
-Z 31605b8bf42e4d96e843b4f7dc30f0f2
+Z 7e8a0ac6a68793100fecd3fb349d5622

diff --git a/manifest.uuid b/manifest.uuid
index 1836affbb02ed99f08443d674772fc5aed4bc4ea..287b09b2999e4856bd9a64eac62cf240503be8bc 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-032e89934f36de10652d3454a0065a337827221a
\ No newline at end of file
+18bdcb05c26860643f53a6b9e85f84109a3ebe5a
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index eff211333cd49df27f255e7dcd439693211cb465..27e7146893303af707c4cd0656d0c8eff1d94811 100644 (file)
--- a/src/btree.c
+++ b/src/btree.c
@@ -4219,7 +4219,7 @@ static const unsigned char *fetchPayload(
   assert( cursorHoldsMutex(pCur) );
   pPage = pCur->apPage[pCur->iPage];
   assert( pCur->aiIdx[pCur->iPage]<pPage->nCell );
-  if( NEVER(pCur->info.nSize==0) ){
+  if( pCur->info.nSize==0 ){
     btreeParseCell(pCur->apPage[pCur->iPage], pCur->aiIdx[pCur->iPage],
                    &pCur->info);
   }