Fix a problem with virtual tables and left joins introduced by

check-in (4761).  Ticket #2894 and #2913. (CVS 4765)

FossilOrigin-Name: ebeac2a499ce16ac7e6d12daa5ce9d41e9067d28
This commit is contained in:
drh
2008-01-31 19:34:51 +00:00
parent 78398d269f
commit 1d454a31b5
3 changed files with 9 additions and 8 deletions
+6 -6
View File
@@ -1,5 +1,5 @@
C Version\s3.5.5\s(CVS\s4764)
D 2008-01-31T17:25:14
C Fix\sa\sproblem\swith\svirtual\stables\sand\sleft\sjoins\sintroduced\sby\ncheck-in\s(4761).\s\sTicket\s#2894\sand\s#2913.\s(CVS\s4765)
D 2008-01-31T19:34:52
F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7
F Makefile.in bc2b5df3e3d0d4b801b824b7ef6dec43812b049b
F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -170,7 +170,7 @@ F src/update.c 31edd9c9764e80753930bd5f9b43e0edb404636f
F src/utf.c ef4b7d83bae533b76c3e1bf635b113fdad86a736
F src/util.c c56e41ed4769c1f2b8af9ffde4757a7b4fb08ed1
F src/vacuum.c 3f34f278809bf3eb0b62ec46ff779e9c385b28f0
F src/vdbe.c a21942ef4369df8c1251dd128278c376aea4781d
F src/vdbe.c 451ead624d98c95dd9dd41c38afab85bba00122a
F src/vdbe.h 58a7d931ffb704e034b2a725981cfa5bd406fad9
F src/vdbeInt.h b7a18349e9b29eca4b642aee6233ac02dd63ad87
F src/vdbeapi.c 93c72ed24d59ed86a634b6d593cdec8376b24513
@@ -614,7 +614,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
P 5fbda121743261f965d18342356a7c270daba416
R 364e82c6efd0347de00dcbae563ca888
P cb5bf4642f30ccd9052d76c3a47e7c5afc32afe6
R a37040921705bf91b118e412481fa829
U drh
Z 39f08961690469dec686227640eb629a
Z 0aaeaf0fdf81d2ffa30bec3d67135f9d
+1 -1
View File
@@ -1 +1 @@
cb5bf4642f30ccd9052d76c3a47e7c5afc32afe6
ebeac2a499ce16ac7e6d12daa5ce9d41e9067d28
+2 -1
View File
@@ -43,7 +43,7 @@
** in this file for details. If in doubt, do not deviate from existing
** commenting and indentation practices when changing or adding code.
**
** $Id: vdbe.c,v 1.706 2008/01/31 15:53:45 drh Exp $
** $Id: vdbe.c,v 1.707 2008/01/31 19:34:52 drh Exp $
*/
#include "sqliteInt.h"
#include <ctype.h>
@@ -4476,6 +4476,7 @@ case OP_VFilter: { /* jump */
pc = pOp->p2 - 1;
}
}
pCur->nullRow = 0;
break;
}