Update the version number to 3.5.3. Fix some minor testing problems. (CVS 4563)

FossilOrigin-Name: f4c8f2d1918f24514f02cae9172c77f6957d32c1

diff --git a/VERSION b/VERSION
index 87ce492908ab2362771f27134bab4a075348a8f3..444877d48fb6923ffb0c7c872a3eebb1f8ca5def 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.5.2
+3.5.3

diff --git a/manifest b/manifest
index c2a035b6f3d2f01ebb2a1181201bef770abf0b68..38cc2a5a0b8b45f8337830c2c9174bcc912dd2d3 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,10 +1,10 @@
-C Add\slikely()\sand\sunlikely()\smacros\sto\sthe\sheader\sfile.\s\sThey\sare\snot\nyet\sused\sfor\sanything.\s(CVS\s4562)
-D 2007-11-27T02:38:01
+C Update\sthe\sversion\snumber\sto\s3.5.3.\s\sFix\ssome\sminor\stesting\sproblems.\s(CVS\s4563)
+D 2007-11-27T14:46:42
 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7
 F Makefile.in 35396fd58890420b29edcf27b6c0e2d054862a6b
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
-F VERSION 7462505067ad1163a13b6763eea21e0d0c0413a6
+F VERSION 37c652fc2532226ab2fef7184de9500dafa52d7d
 F aclocal.m4 d20ba55930a05197b484809fba1d2b603f4e67a6
 F addopcodes.awk 701697fae48376375ec8532c3d04e910cfeef352
 F art/2005osaward.gif 0d1851b2a7c1c9d0ccce545f3e14bca42d7fd248
@@ -95,7 +95,7 @@ F src/expr.c 7977bb9680ebeeabfa3214d936778baaa26dcc0c
 F src/func.c 73b4974e5ff03cc71345cc3a33b0022f7b99974a
 F src/hash.c 45a7005aac044b6c86bd7e49c44bc15d30006d6c
 F src/hash.h 031cd9f915aff27e12262cb9eb570ac1b8326b53
-F src/insert.c 86fe24ca954b6b3b6c32d05e5aa17387f244cfbb
+F src/insert.c a090c7258f2be707cca8f0cf376142f141621241
 F src/journal.c 807bed7a158979ac8d63953e1774e8d85bff65e2
 F src/legacy.c 4ac53191fad2e3c4d59bde1228879b2dc5a96d66
 F src/limits.h 71ab25f17e35e0a9f3f6f234b8ed49cc56731d35
@@ -178,7 +178,7 @@ F src/vtab.c f819d55ef638d45e09ce00009d435da8bf16f528
 F src/where.c 82e2cb76d7e15d79a5b19eaef23284c31868d4ee
 F tclinstaller.tcl 4356d9d94d2b5ed5e68f9f0c80c4df3048dd7617
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
-F test/all.test 23c2231ff0361b86cd7278d107208646bbc20196
+F test/all.test ee350b9ab15b175fc0a8fb51bf2141ed3a3b9cba
 F test/alter.test a87b7933d41c713c53341abe4eb014d0e273119e
 F test/alter2.test 4e0c502214daa710a0a9d7ec9689a0326b1a4e2a
 F test/alter3.test 8ce6b9c5605b3cfe7b901f454ecaf174c4f93e31
@@ -592,7 +592,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P d0a4c2a36385c03dfadbb844823d0ed2458bf619
-R 68e874db096a0d636c7b15038d57783c
+P 485add38a1ef224732575f9998f06466dcc9742d
+R bc8519e0c868849ae7eb268dfbffad1f
 U drh
-Z 0996ff707e65338ef5f990b0634c44ed
+Z bbeab01aa041143e8c0d94dcc39a5010

diff --git a/manifest.uuid b/manifest.uuid
index cde87396023f1778420c4a5b1dba7d715b352690..4c240e0c01851819f47fa72f9bb91f1ceff11819 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-485add38a1ef224732575f9998f06466dcc9742d
\ No newline at end of file
+f4c8f2d1918f24514f02cae9172c77f6957d32c1
\ No newline at end of file

diff --git a/src/insert.c b/src/insert.c
index b77dffc6899c5db8c56912b587be62d1f0133e94..85e4f34955ff9799b8dca15e43fa16d80da6e01e 100644 (file)
--- a/src/insert.c
+++ b/src/insert.c
@@ -12,7 +12,7 @@
 ** This file contains C code routines that are called by the parser
 ** to handle INSERT statements in SQLite.
 **
-** $Id: insert.c,v 1.193 2007/11/23 15:02:19 drh Exp $
+** $Id: insert.c,v 1.194 2007/11/27 14:46:42 drh Exp $
 */
 #include "sqliteInt.h"
 
@@ -127,11 +127,13 @@ static int readsTable(Vdbe *v, int iStartAddr, int iDb, Table *pTab){
         }
       }
     }
+#ifndef SQLITE_OMIT_VIRTUALTABLE
     if( pOp->opcode==OP_VOpen && pOp->p3==(const char*)pTab->pVtab ){
       assert( pOp->p3!=0 );
       assert( pOp->p3type==P3_VTAB );
       return 1;
     }
+#endif
   }
   return 0;
 }

diff --git a/test/all.test b/test/all.test
index bc39a7e7aaf20c1fd549524d76ea68349001d19f..03a24d865392fd44e1d400a63441e7db94766b4d 100644 (file)
--- a/test/all.test
+++ b/test/all.test
@@ -10,7 +10,7 @@
 #***********************************************************************
 # This file runs all tests.
 #
-# $Id: all.test,v 1.51 2007/11/26 13:36:00 drh Exp $
+# $Id: all.test,v 1.52 2007/11/27 14:46:42 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -65,7 +65,7 @@ lappend EXCLUDE memleak.test           ;# Alternate test driver script
 lappend EXCLUDE fuzz.test
 lappend EXCLUDE soak.test              ;# Takes a very long time (default 1 hr)
 lappend EXCLUDE fts3.test              ;# Wrapper for muliple fts3*.tests
-lappend EXCLUSE mallocAll.test         ;# Wrapper for running all malloc tests
+lappend EXCLUDE mallocAll.test         ;# Wrapper for running all malloc tests
 
 # Files to include in the test.  If this list is empty then everything
 # that is not in the EXCLUDE list is run.