Make sure a unique cursor number is allocated for automatic indices.

FossilOrigin-Name: 433d1aecd399590b767ebf07b32023fb718a6574

diff --git a/manifest b/manifest
index e546c5f58b44f98d593f81686b41cef343976db1..b32322793dd8781d89f434323687a115895cdfa0 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Do\snot\sattempt\sto\sgenerate\scode\sin\sthe\sNGQP\sif\sthere\shave\sbeen\sprior\serrors,\nsince\swith\sprior\serrors\ssome\sof\sthe\sexpressions\smight\snot\sbe\sfully\s\nnamed\sresolved.
-D 2013-05-31T19:14:56.877
+C Make\ssure\sa\sunique\scursor\snumber\sis\sallocated\sfor\sautomatic\sindices.
+D 2013-05-31T20:00:58.768
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -289,7 +289,7 @@ F src/vtab.c b05e5f1f4902461ba9f5fc49bb7eb7c3a0741a83
 F src/wal.c 436bfceb141b9423c45119e68e444358ee0ed35d
 F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
 F src/walker.c 4fa43583d0a84b48f93b1e88f11adf2065be4e73
-F src/where.c 0c1d6feb0c2ffcc3e37b2d0b5ce044773daa3d44
+F src/where.c 3d93b77c4acc97f0dc018d251f2e2833f8df5663
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
 F test/aggnested.test 45c0201e28045ad38a530b5a144b73cd4aa2cfd6
@@ -1093,7 +1093,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
-P 0b1bee92a0d25f409d5a95f484b05ddf10ae945f
-R 3775b32a7236de56bac48d67633687ab
+P 665e4291c6e78f11d7181c18c5f2418d1adfcb1c
+R 2b43f41e454a1bbd459d18838a33d5bf
 U drh
-Z ab504bcb48497c438de08e5ddd0f5c9c
+Z 9f4cea41d946c49ff071caa4f1da93db

diff --git a/manifest.uuid b/manifest.uuid
index ca22f8fcd826bf732cc9f9c76fe8ee6ef5ac5a86..9e292ef1c667f9366b8e79873580d859862bc7a5 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-665e4291c6e78f11d7181c18c5f2418d1adfcb1c
\ No newline at end of file
+433d1aecd399590b767ebf07b32023fb718a6574
\ No newline at end of file

diff --git a/src/where.c b/src/where.c
index aee574a23a38c2984661ea9a9d388fa140cd346c..bd0d410cd2e77e9298cde92c18ac02fe51377d9b 100644 (file)
--- a/src/where.c
+++ b/src/where.c
@@ -1925,6 +1925,7 @@ static void constructAutomaticIndex(
   /* Create the automatic index */
   pKeyinfo = sqlite3IndexKeyinfo(pParse, pIdx);
   assert( pLevel->iIdxCur>=0 );
+  pLevel->iIdxCur = pParse->nTab++;
   sqlite3VdbeAddOp4(v, OP_OpenAutoindex, pLevel->iIdxCur, nColumn+1, 0,
                     (char*)pKeyinfo, P4_KEYINFO_HANDOFF);
   VdbeComment((v, "for %s", pTable->zName));