Incorrect version of build.c checked in at [87e5f5a6c60e3] (because I

neglected to press the "Save" button on the text editor).  There is no change
to the logic, just improved presentation.

FossilOrigin-Name: cf569f9f2fab1828e4bfced111fd9a6ee23ea8c0

diff --git a/manifest b/manifest
index 056d33d3a7d53623c08b8d8c6f0c55f1e21a4385..9328401ca9f1d68e2933d807185981b3f81445fc 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Make\ssure\s"0"\sintended\sas\sa\sNULL\spointer\sis\scast\sto\sa\spointer\swhen\sused\nin\sa\svarargs\sfunctions\sparameter.
-D 2016-04-05T14:02:16.715
+C Incorrect\sversion\sof\sbuild.c\schecked\sin\sat\s[87e5f5a6c60e3]\s(because\sI\nneglected\sto\spress\sthe\s"Save"\sbutton\son\sthe\stext\seditor).\s\sThere\sis\sno\schange\nto\sthe\slogic,\sjust\simproved\spresentation.
+D 2016-04-05T15:59:23.006
 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 ab763de47337f1acf03de6b36cbc13c90d20b932
+F src/build.c c5cf206191880f88142352629d53fed174fc10bd
 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 87e5f5a6c60e37e943b3ce80617e81b09852515e
-R a877aa3d312b2b09cc17cdd970ec6cc3
+P ed128e8b826cd9620b7146d01d461ed28b9a672d
+R 27e5e4c2995b5324778005dedfa90fe5
 U drh
-Z 781d8f18c7a4bdfd2f2083091977b2ca
+Z ed5acb084f4d8b134ae4eeee3cdc81ad

diff --git a/manifest.uuid b/manifest.uuid
index ef7f23a7aa5dc22d174ef7982c3ff61178224939..cf9761250d9e3805dc52992988f2489215a9d172 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ed128e8b826cd9620b7146d01d461ed28b9a672d
\ No newline at end of file
+cf569f9f2fab1828e4bfced111fd9a6ee23ea8c0
\ No newline at end of file

diff --git a/src/build.c b/src/build.c
index 41ded1f8e4af07562085c476846d68e0376fafcf..e7a6824fb2c0092903698b0bdfa4e9d50bba8517 100644 (file)
--- a/src/build.c
+++ b/src/build.c
@@ -2762,6 +2762,7 @@ static void sqlite3RefillIndex(Parse *pParse, Index *pIndex, int memRootPage){
     tnum = pIndex->tnum;
   }
   pKey = sqlite3KeyInfoOfIndex(pParse, pIndex);
+  assert( pKey!=0 || db->mallocFailed || pParse->nErr );
 
   /* Open the sorter cursor if we are to use one. */
   iSorter = pParse->nTab++;
@@ -2785,8 +2786,7 @@ static void sqlite3RefillIndex(Parse *pParse, Index *pIndex, int memRootPage){
   sqlite3VdbeChangeP5(v, OPFLAG_BULKCSR|((memRootPage>=0)?OPFLAG_P2ISREG:0));
 
   addr1 = sqlite3VdbeAddOp2(v, OP_SorterSort, iSorter, 0); VdbeCoverage(v);
-  assert( pKey!=0 || db->mallocFailed || pParse->nErr );
-  if( IsUniqueIndex(pIndex) /*&& pKey!=0*/ ){
+  if( IsUniqueIndex(pIndex) ){
     int j2 = sqlite3VdbeCurrentAddr(v) + 3;
     sqlite3VdbeGoto(v, j2);
     addr2 = sqlite3VdbeCurrentAddr(v);