Remove a C++-ism that slipped into the code during the recent CHECK

enhancements.  Ticket #1513. (CVS 2762)

FossilOrigin-Name: e66289b52f56c8242aa264a9365c834cd820e988

diff --git a/manifest b/manifest
index 40232dddcf8446abdb0da459e1a123492cfe0991..73c9d98dd0ea777fdbc556f24d0c48d2cd079ee0 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improved\stable\scompression\sin\slemon\sreduces\sthe\soverall\slibrary\ssize\nby\sabout\s1.5KiB.\s(CVS\s2761)
-D 2005-11-05T15:04:00
+C Remove\sa\sC++-ism\sthat\sslipped\sinto\sthe\scode\sduring\sthe\srecent\sCHECK\nenhancements.\s\sTicket\s#1513.\s(CVS\s2762)
+D 2005-11-05T15:07:56
 F Makefile.in 12784cdce5ffc8dfb707300c34e4f1eb3b8a14f1
 F Makefile.linux-gcc aee18d8a05546dcf1888bd4547e442008a49a092
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -41,7 +41,7 @@ F src/complete.c 4de937dfdd4c79a501772ab2035b26082f337a79
 F src/date.c 7444b0900a28da77e57e3337a636873cff0ae940
 F src/delete.c 29dac493f4d83b05f91233b116827c133bcdab72
 F src/experimental.c 50c1e3b34f752f4ac10c36f287db095c2b61766d
-F src/expr.c a1ca13387073839c8be909d734927344b23d0387
+F src/expr.c 696434cee4428699957d006c564ee84f716c0559
 F src/func.c 7d81dccd9c440c6c4e761056333e629192814af0
 F src/hash.c 8747cf51d12de46512880dfcf1b68b4e24072863
 F src/hash.h 1b0c445e1c89ff2aaad9b4605ba61375af001e84
@@ -317,7 +317,7 @@ F www/tclsqlite.tcl ddcf912ea48695603c8ed7efb29f0812ef8d1b49
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P 1b6bf4188e8ebf55cf1972b7081f6d31bf525555
-R 0643dda995921861878ddcf931a00061
+P 86ac11476962727d2d40b62ce87d689c01969537
+R 9a16191c624a634ada9ef30eb37671af
 U drh
-Z 1e38b5f3f01e11660fc6060d64bb658c
+Z 2e997b85f90ec5cddf82f0239d534b9f

diff --git a/manifest.uuid b/manifest.uuid
index e80907e0ef97b0feb4b94ab96daad57406f229dc..0cb0dd7214ffa7a1d77b57e2b6c7fc5d7b3e93f4 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-86ac11476962727d2d40b62ce87d689c01969537
\ No newline at end of file
+e66289b52f56c8242aa264a9365c834cd820e988
\ No newline at end of file

diff --git a/src/expr.c b/src/expr.c
index cce2a6681063a3b5e32ad183e9120c387cbb867f..ba25a5ad4f496543707d2465382b664055c88c75 100644 (file)
--- a/src/expr.c
+++ b/src/expr.c
@@ -12,7 +12,7 @@
 ** This file contains routines used for analyzing expressions and
 ** for generating VDBE code that evaluates expressions in SQLite.
 **
-** $Id: expr.c,v 1.235 2005/11/03 12:33:28 drh Exp $
+** $Id: expr.c,v 1.236 2005/11/05 15:07:56 drh Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -1188,12 +1188,12 @@ static int nameResolverStep(void *pArg, Expr *pExpr){
 #endif
     case TK_IN: {
       if( pExpr->pSelect ){
+        int nRef = pNC->nRef;
 #ifndef SQLITE_OMIT_CHECK
         if( pNC->isCheck ){
           sqlite3ErrorMsg(pParse,"subqueries prohibited in CHECK constraints");
         }
 #endif
-        int nRef = pNC->nRef;
         sqlite3SelectResolve(pParse, pExpr->pSelect, pNC);
         assert( pNC->nRef>=nRef );
         if( nRef!=pNC->nRef ){