Add vdbeaux.c to the list of files that must be compiled with -DSQLITE_TEST=1

in order to generate testfixture.  Do not require sqlit3OsDelete() to
succeed on a multi-database commit.  (Ticket #1917) (CVS 3351)

FossilOrigin-Name: dfc833ac79cb255902b20700d6d8949a66af093f

diff --git a/main.mk b/main.mk
index ab194d770c2303ec564a8bf952d0cc2975dc518f..8bf95af7a80702193b3de3118a8a3bb717e20aef 100644 (file)
--- a/main.mk
+++ b/main.mk
@@ -149,6 +149,7 @@ TESTSRC = \
   $(TOP)/src/utf.c \
   $(TOP)/src/util.c \
   $(TOP)/src/vdbe.c \
+  $(TOP)/src/vdbeaux.c \
   $(TOP)/src/where.c
 
 # Header files used by all library source files.

diff --git a/manifest b/manifest
index e1c91b0dc4a81d230982e2a6efb6f14a600b930a..237e3d886f51026b3cd1fc6d7fcacb6bd3bab361 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Vtab2.test\sscript\sworks\sregardless\sof\swhat\sTCL\sversion\sis\sused.\s(CVS\s3350)
-D 2006-08-13T18:43:55
+C Add\svdbeaux.c\sto\sthe\slist\sof\sfiles\sthat\smust\sbe\scompiled\swith\s-DSQLITE_TEST=1\nin\sorder\sto\sgenerate\stestfixture.\s\sDo\snot\srequire\ssqlit3OsDelete()\sto\nsucceed\son\sa\smulti-database\scommit.\s\s(Ticket\s#1917)\s(CVS\s3351)
+D 2006-08-13T19:04:19
 F Makefile.in 9c2a76055c305868cc5f5b73e29a252ff3632c0a
 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -19,7 +19,7 @@ F doc/lemon.html f0f682f50210928c07e562621c3b7e8ab912a538
 F doc/report1.txt a031aaf37b185e4fa540223cb516d3bccec7eeac
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895
 F ltmain.sh f6b283068efa69f06eb8aa1fe4bddfdbdeb35826
-F main.mk e753590214c7f8d4588e130b811495611dddaa5c
+F main.mk bfa218fe52af316390bb344f8660241d90f277dd
 F mkdll.sh 919df5efde876194e3102c6ebc60657d38949909
 F mkopcodec.awk bd46ad001c98dfbab07b1713cb8e692fa0e5415d
 F mkopcodeh.awk cde995d269aa06c94adbf6455bea0acedb913fa5
@@ -101,7 +101,7 @@ F src/vdbe.c 3cea0b930abca02facd4c01fc6f369015730a926
 F src/vdbe.h 258b5d1c0aaa72192f09ff0568ce42b383f156fa
 F src/vdbeInt.h e3eaab262b67b84474625cfc38aec1125c32834b
 F src/vdbeapi.c 81f531d7dc5c898131b02ef85f6c6144ab2892cf
-F src/vdbeaux.c d56304b50c912faefd9f88dff621391310ed2fc5
+F src/vdbeaux.c 9fab61427a0741c9c123e8ff16e349b1f90397be
 F src/vdbefifo.c 9efb94c8c3f4c979ebd0028219483f88e57584f5
 F src/vdbemem.c 5f0afe3b92bb2c037f8d5d697f7c151fa50783a3
 F src/vtab.c cae036dc7b0b7d7f5f17eef646b1d53940a21572
@@ -295,7 +295,7 @@ F test/vacuum2.test 5aea8c88a65cb29f7d175296e7c819c6158d838c
 F test/varint.test ab7b110089a08b9926ed7390e7e97bdefeb74102
 F test/view.test 16e2774fe35e47a07ac4471b7f0bcc948b1aa6d5
 F test/vtab1.test c794695b32fe9428ef1087281374e2a1e6044df2
-F test/vtab2.test a025a21c2f7d29d9635b30490a8fb1961095b3dc
+F test/vtab2.test 43763026b124e68785de05d3fbf957a4b5f81a0d
 F test/vtab3.test f38d6d7d19f08bffdadce4d5b8cba078f8118587
 F test/vtab4.test 4b4293341443839ef6dc02f8d9e614702a6c67ff
 F test/vtab5.test 9fb8f335651afe8f870011e2f68e5b00c5ad03cd
@@ -377,7 +377,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P 867defe32873ce82b6e1f5ddb8ad12178f2d76d6
-R 10309f6475890ae53aa0abb8bbf23f75
+P 6df3f6761a16ac5a02152f3c7f0c0e4944112ada
+R 9bbe5e643c0a843783f511bd51b4a1b6
 U drh
-Z d91510d341360efc878c541625fb7e42
+Z 075f467ece5b5f168ef23828395a4d30

diff --git a/manifest.uuid b/manifest.uuid
index 2ce37c58bacc9d8be9564458a203e7d456092d60..5366990aa1a44395f61fdd881ff0a39ea1371f90 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6df3f6761a16ac5a02152f3c7f0c0e4944112ada
\ No newline at end of file
+dfc833ac79cb255902b20700d6d8949a66af093f
\ No newline at end of file

diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index 35bf07f42264cf454a86b2acfa4f7237e14d7559..d06fa3793b20726254e3ee9e77c46f067c388f6d 100644 (file)
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -1145,7 +1145,9 @@ static int vdbeCommit(sqlite3 *db){
     ** transaction files are deleted.
     */
     rc = sqlite3OsDelete(zMaster);
-    assert( rc==SQLITE_OK );
+    if( rc ){
+      return rc;
+    }
     sqliteFree(zMaster);
     zMaster = 0;
     rc = sqlite3OsSyncDirectory(zMainFile);

diff --git a/test/vtab2.test b/test/vtab2.test
index 005a49ab235cc6af8f6ae16da2dd3278c64d21d8..909a273e234723d99c617aabfaf5a5f4f910217c 100644 (file)
--- a/test/vtab2.test
+++ b/test/vtab2.test
@@ -10,7 +10,7 @@
 #***********************************************************************
 # This file implements regression tests for SQLite library.
 #
-# $Id: vtab2.test,v 1.5 2006/08/13 18:43:55 drh Exp $
+# $Id: vtab2.test,v 1.6 2006/08/13 19:04:19 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -53,6 +53,8 @@ do_test vtab2-2.2 {
     SELECT * FROM vars WHERE name='A';
   }
 } [list A 1 1 A 2 4 A 3 9]
+unset -nocomplain result
+unset -nocomplain var
 set result {}
 foreach var [lsort [info vars tcl_*]] {
   catch {lappend result $var [set $var]}
@@ -64,5 +66,7 @@ do_test vtab2-2.3 {
       ORDER BY name;
   }
 } $result
+unset result
+unset var
 
 finish_test