Fix a couple of minor problems with transactions in virtual tables. (CVS 5081)

FossilOrigin-Name: 2275fc6ee06b17da5808cecfa5570ac6439eaf74

diff --git a/manifest b/manifest
index 6be5b6b73812be736ff6f1b4cff40a1dd94c67e0..f72b61a35630f6216cc9849d0539db7d796699b9 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Avoid\sleaking\spage\sreferences\swhen\sdatabase\scorruption\sis\sencountered.\s(CVS\s5080)
-D 2008-05-05T12:09:33
+C Fix\sa\scouple\sof\sminor\sproblems\swith\stransactions\sin\svirtual\stables.\s(CVS\s5081)
+D 2008-05-05T13:23:04
 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7
 F Makefile.in 25b3282a4ac39388632c2fb0e044ff494d490952
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -145,7 +145,7 @@ F src/test4.c c2c0f5dc907f1346f5d4b65eb5799f11eb9e4071
 F src/test5.c 3a6a5717a149d7ca2e6d14f5be72cf7555d54dc4
 F src/test6.c 62281c0a9ac0265e579065942f7de4e080f8eb05
 F src/test7.c acec2256c7c2d279db5a8b5fa1a2a68fcc942c67
-F src/test8.c a7fdf75d7e6c06ca9aa77b026f6d76dbd41aef25
+F src/test8.c beca53180c42ee388c0c882a529739d3d1001f99
 F src/test9.c 4615ef08750245a2d96aaa7cbe2fb4aff2b57acc
 F src/test_async.c 3147c64c34721f088d5ab20f85dabd5d7732c007
 F src/test_autoext.c 5e892ab84aece3f0428920bf46923f16ac83962a
@@ -177,7 +177,7 @@ F src/vdbeaux.c aae523de91fb72a32a256253880739fe103ea76e
 F src/vdbeblob.c 554736781ee273a8089c776e96bdb53e66f57ce6
 F src/vdbefifo.c a30c237b2a3577e1415fb6e288cbb6b8ed1e5736
 F src/vdbemem.c 8cdc5d4c9558338a2c5ae81135d0826136833b5e
-F src/vtab.c e058c520c193d7a197c230c66a90efba660d8f9a
+F src/vtab.c ce9d19ca9053812a557010fd4be7e842f8ebba2d
 F src/where.c 85719d58e0f680b5d8239dc6af82b159775d7376
 F tclinstaller.tcl 4356d9d94d2b5ed5e68f9f0c80c4df3048dd7617
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
@@ -634,7 +634,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P 8fa2bda4c594119cbbc489b9879c52b134a57711
-R 151ba0b2bb32ec7f98eb22eec73c5c65
-U danielk1977
-Z 01f35ec83f56376c6cddd2c6beaaf252
+P 270d47e8d0a20868879a95b66cb547e1e5b642d9
+R 384696721267b63cda5341ca180b7b1f
+U drh
+Z 11a335d880f2acd480b0e07b2674209e

diff --git a/manifest.uuid b/manifest.uuid
index 8f9a970f3df75cb897d44b48b6102522a49629b0..a5e97b9d53b4a51130e58e6ae32cc0b6bba699be 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-270d47e8d0a20868879a95b66cb547e1e5b642d9
\ No newline at end of file
+2275fc6ee06b17da5808cecfa5570ac6439eaf74
\ No newline at end of file

diff --git a/src/test8.c b/src/test8.c
index 064279d25d37c39279fe9f1a258f8c6f6e48006e..97762d2235f55a4a3d4df5aa6703459bd85b02c0 100644 (file)
--- a/src/test8.c
+++ b/src/test8.c
@@ -13,7 +13,7 @@
 ** is not included in the SQLite library.  It is used for automated
 ** testing of the SQLite library.
 **
-** $Id: test8.c,v 1.62 2008/04/28 20:27:54 drh Exp $
+** $Id: test8.c,v 1.63 2008/05/05 13:23:04 drh Exp $
 */
 #include "sqliteInt.h"
 #include "tcl.h"
@@ -1000,10 +1000,11 @@ static int echoTransactionCall(sqlite3_vtab *tab, const char *zCall){
   char *z;
   echo_vtab *pVtab = (echo_vtab *)tab;
   z = sqlite3_mprintf("echo(%s)", pVtab->zTableName);
+  if( z==0 ) return SQLITE_NOMEM;
   appendToEchoModule(pVtab->interp, zCall);
   appendToEchoModule(pVtab->interp, z);
   sqlite3_free(z);
-  return (z?SQLITE_OK:SQLITE_NOMEM);
+  return SQLITE_OK;
 }
 static int echoBegin(sqlite3_vtab *tab){
   int rc;
@@ -1067,9 +1068,7 @@ static int echoCommit(sqlite3_vtab *tab){
   sqlite3FaultBenign(SQLITE_FAULTINJECTOR_MALLOC, 1);
   rc = echoTransactionCall(tab, "xCommit");
   sqlite3FaultBenign(SQLITE_FAULTINJECTOR_MALLOC, 0);
-  if( rc==SQLITE_OK ){
-    pVtab->inTransaction = 0;
-  }
+  pVtab->inTransaction = 0;
   return rc;
 }
 static int echoRollback(sqlite3_vtab *tab){

diff --git a/src/vtab.c b/src/vtab.c
index c3d7ee2dbc17452ffa3a318a8a3f00d5746e287f..74c14c8d49aecd21c3cfe742610e21a4588b3075 100644 (file)
--- a/src/vtab.c
+++ b/src/vtab.c
@@ -11,7 +11,7 @@
 *************************************************************************
 ** This file contains code used to help implement virtual tables.
 **
-** $Id: vtab.c,v 1.68 2008/04/28 18:46:43 drh Exp $
+** $Id: vtab.c,v 1.69 2008/05/05 13:23:04 drh Exp $
 */
 #ifndef SQLITE_OMIT_VIRTUALTABLE
 #include "sqliteInt.h"
@@ -818,6 +818,8 @@ void sqlite3VtabMakeWritable(Parse *pParse, Table *pTab){
   pParse->apVtabLock = sqlite3_realloc(pParse->apVtabLock, n);
   if( pParse->apVtabLock ){
     pParse->apVtabLock[pParse->nVtabLock++] = pTab;
+  }else{
+    pParse->db->mallocFailed = 1;
   }
 }