bug fix (CVS 142)

FossilOrigin-Name: f255ea6d4bb085a869485c14b4c96af13ca826fa

diff --git a/VERSION b/VERSION
index 6d7de6e6abef13b18021a3591debc53ac00616d4..21e8796a09d4f26935ffc4879147879a153f0193 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.0.2
+1.0.3

diff --git a/manifest b/manifest
index c089b23d7d181eadbf9644aa8393d30c302b9ead..089933a38bfd174cc966de832224a5de92116f89 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,9 +1,9 @@
-C :-)\s(CVS\s141)
-D 2000-08-22T13:47:57
+C bug\sfix\s(CVS\s142)
+D 2000-08-22T18:29:34
 F COPYRIGHT 74a8a6531a42e124df07ab5599aad63870fa0bd4
 F Makefile.in 036bce328b963f48dbaadbec8cc4144a1fd9e50a
 F README 51f6a4e7408b34afa5bc1c0485f61b6a4efb6958
-F VERSION 880d9396e60cb9e65a3af230f9467412553b6d50
+F VERSION 8fbc549835992841cbef4232a1d5b86780d3ad5b
 F configure 078a370347baf9375baa8053857ca1e6bc84afa7 x
 F configure.in 381aeb4564f1562b7b2a115f5e99035c561a7fea
 F doc/lemon.html e233a3e97a779c7a87e1bc4528c664a58e49dd47
@@ -26,7 +26,7 @@ F src/update.c 51b9ef7434b15e31096155da920302e9db0d27fc
 F src/util.c b75b33e6bd5d47898bb7ed9fdd0dea4fe7c19b00
 F src/vdbe.c bdedf21230581f0cf73a2dcd8fe23f30cf30ebe6
 F src/vdbe.h 6c5653241633c583549c2d8097394ab52550eb63
-F src/where.c 420f666a38b405cd58bd7af832ed99f1dbc7d336
+F src/where.c 3dfad2ffd0aa994d5eceac88852f7189c8d1d3c8
 F test/all.test 0950c135cab7e60c07bd745ccfad1476211e5bd7
 F test/copy.test b77a1214bd7756f2849d5c4fa6e715c0ff0c34eb
 F test/dbbe.test c6079572516aeb2739a35fd272b105c45c30cc76
@@ -61,7 +61,7 @@ F www/arch.fig 4e26e9dca3c49724fc8f554c695ddea9f2413156
 F www/arch.png c4d908b79065a72e7dcf19317f36d1324c550e87
 F www/arch.tcl 4f6a9afecc099a27bba17b4f8cc9561abc15dc40
 F www/c_interface.tcl 1b79e404a0dd46f44cd453a44b01df568c9586d1
-F www/changes.tcl 12d390033b0f65841396f9c0e74b27ad415b1b61
+F www/changes.tcl a457553fce8400977cc484ae47a0a2011491bb7f
 F www/crosscompile.tcl 19734ce7f18b16ff2ed8479412abf8aca56e1dcc
 F www/fileformat.tcl cfb7fba80b7275555281ba2f256c00734bcdd1c9
 F www/index.tcl 2f5cc070b8fa8c3fc2f71bba4e6b7877d528fbde
@@ -70,7 +70,7 @@ F www/mingw.tcl fc5f4ba9d336b6e8c97347cc6496d6162461ef60
 F www/opcode.tcl cb3a1abf8b7b9be9f3a228d097d6bf8b742c2b6f
 F www/sqlite.tcl cb0d23d8f061a80543928755ec7775da6e4f362f
 F www/vdbe.tcl bcbfc33bcdd0ebad95eab31286adb9e1bc289520
-P 9d72ceb44d325963ffdf5d247961519dc2cb72ad
-R 603335734419a5d34b7543742d689dcb
+P 7ecc9c447bd9259c52e82c8a75830c7fc3381af7
+R d941b15d38d95642a66b6ff4bba2c454
 U drh
-Z 711ba37325e02d401d1540181826ed38
+Z 20279627a80a674fdd5f37866394e8e6

diff --git a/manifest.uuid b/manifest.uuid
index 8562ad02e133b387f7a79c02b54574731fcc056a..eb6569841237dcbeea155a9ba8cefe7944aaf318 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7ecc9c447bd9259c52e82c8a75830c7fc3381af7
\ No newline at end of file
+f255ea6d4bb085a869485c14b4c96af13ca826fa
\ No newline at end of file

diff --git a/src/where.c b/src/where.c
index 5cf7d7a3af58b6fd455ec68262c3b8174bd50a3c..a50ba4986b4a6cd5839de9afd8dfc4e9c483afda 100644 (file)
--- a/src/where.c
+++ b/src/where.c
@@ -25,7 +25,7 @@
 ** the WHERE clause of SQL statements.  Also found here are subroutines
 ** to generate VDBE code to evaluate expressions.
 **
-** $Id: where.c,v 1.8 2000/06/21 13:59:13 drh Exp $
+** $Id: where.c,v 1.9 2000/08/22 18:29:34 drh Exp $
 */
 #include "sqliteInt.h"
 
@@ -324,7 +324,7 @@ WhereInfo *sqliteWhereBegin(
       if( i==pTabList->nId-1 && pushKey ){
         haveKey = 1;
       }else{
-        sqliteVdbeAddOp(v, OP_Fetch, idx, 0, 0, 0);
+        sqliteVdbeAddOp(v, OP_Fetch, base+idx, 0, 0, 0);
         haveKey = 0;
       }
     }

diff --git a/www/changes.tcl b/www/changes.tcl
index 0468b8380e9b33699c7abf8b85d947e463ac368d..fe7fb32957e88fb8007093f3da4da6f54c5922b4 100644 (file)
--- a/www/changes.tcl
+++ b/www/changes.tcl
@@ -17,11 +17,15 @@ proc chng {date desc} {
   puts "<DD><P><UL>$desc</UL></P></DD>"
 }
 
-chng {2000 Aug 22 (Version 1.0.2)} {
+chng {2000 Aug 22 (Version 1.0.3)} {
 <li>In the sqlite shell, print the "Database opened READ ONLY" message
     to stderr instead of stdout.</li>
 <li>In the sqlite shell, now print the version number on initial startup.</li>
 <li>Add the <b>sqlite_version[]</b> string constant to the library</li>
+<li>Makefile updates</li>
+<li>Bug fix: incorrect VDBE code was being generated for the following
+    circumstance: a query on an indexed table containing a WHERE clause with
+    an IN operator that had a subquery on its right-hand side.</li>
 }
 
 chng {2000 Aug 18 (Version 1.0.1)} {