Fix a bug in secondary index initialization when the secondary index is

a superset of the PRIMARY KEY for a WITHOUT ROWID table.

FossilOrigin-Name: 52a3d885192c5d31f956c5ee17e29e2d1f3d5c9f

diff --git a/manifest b/manifest
index 00f2319e66756beb87f6eb7ca9887110492969fd..79bd212ec2cb6883c838f5c6d3e970e38ecacb93 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\san\s"explain"\scommand\sfrom\stest\sscript\swithout_rowid1.test\sthat\swas\saccidentally\scommitted.
-D 2013-11-05T16:56:11.709
+C Fix\sa\sbug\sin\ssecondary\sindex\sinitialization\swhen\sthe\ssecondary\sindex\sis\na\ssuperset\sof\sthe\sPRIMARY\sKEY\sfor\sa\sWITHOUT\sROWID\stable.
+D 2013-11-05T17:30:04.337
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 0522b53cdc1fcfc18f3a98e0246add129136c654
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -168,7 +168,7 @@ F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
 F src/btree.c 509722ce305471b626d3401c0631a808fd33237b
 F src/btree.h bfe0e8c5759b4ec77b0d18390064a6ef3cdffaaf
 F src/btreeInt.h f038e818bfadf75afbd09819ed93c26a333d39e0
-F src/build.c 6790e7b7023935b03666a0a2ab3c4da78165d661
+F src/build.c 507bacb8f45a2964f7beab1453be80e11e11a709
 F src/callback.c f99a8957ba2adf369645fac0db09ad8adcf1caa2
 F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
 F src/ctime.c ea4b7f3623a0fcb1146e7f245d7410033e86859c
@@ -1133,7 +1133,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 3877c9f50582b51817dcf3cd75d836891a34e590
-R f264b3126a788e0d527316d13cdfd154
-U dan
-Z 807832cc7751f68770c48b635041b00e
+P 4b41d989e894b9214a9b973228ef8446356f9fbb
+R a05ce9adf9842de08a1d6f032363e2df
+U drh
+Z 7d34ccd67e34b00bfe85d5ff3fefd3e0

diff --git a/manifest.uuid b/manifest.uuid
index e17cfd27017348f63c27604e0797e9e5c6071ce7..71b14f736fd20e7b7fcf9bf1f77f013b3ce855e1 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4b41d989e894b9214a9b973228ef8446356f9fbb
\ No newline at end of file
+52a3d885192c5d31f956c5ee17e29e2d1f3d5c9f
\ No newline at end of file

diff --git a/src/build.c b/src/build.c
index 08438f2e6dd6a9b3e1502ba07ccc5c5f3e0dd188..fff588cec1690f06bfe73754347578714d5e2385 100644 (file)
--- a/src/build.c
+++ b/src/build.c
@@ -1676,13 +1676,14 @@ static void convertToWithoutRowidTable(Parse *pParse, Table *pTab){
   for(pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext){
     int n;
     if( pIdx->autoIndex==2 ) continue;
-    if( pIdx->nKeyCol==pTab->nCol ){
-      pIdx->nColumn = pTab->nCol;
-      continue;
-    }
     for(i=n=0; i<nPk; i++){
       if( !hasColumn(pIdx->aiColumn, pIdx->nKeyCol, pPk->aiColumn[i]) ) n++;
     }
+    if( n==0 ){
+      /* This index is a superset of the primary key */
+      pIdx->nColumn = pIdx->nKeyCol;
+      continue;
+    }
     if( resizeIndexObject(db, pIdx, pIdx->nKeyCol+n) ) return;
     for(i=0, j=pIdx->nKeyCol; i<nPk; i++){
       if( !hasColumn(pIdx->aiColumn, pIdx->nKeyCol, pPk->aiColumn[i]) ){