Remove unnecessary sqlite3MallocDisallow() that was preventing win32 from

running. (CVS 4285)

FossilOrigin-Name: eb6c98fc1097b327453d7e8ec8877101ea8187c3

diff --git a/manifest b/manifest
index 9a3083125425bd29adc80a8539ed6447c9bc69c1..34825750d3e3576735fafb327c77b2a38088bce1 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\stests\sto\ssimulate\spower-failure\son\sdevices\sthat\ssupport\sIOCAP_SEQUENTIAL\sor\sIOCAP_SAFE_APPEND.\s(CVS\s4284)
-D 2007-08-24T08:15:54
+C Remove\sunnecessary\ssqlite3MallocDisallow()\sthat\swas\spreventing\swin32\sfrom\nrunning.\s(CVS\s4285)
+D 2007-08-24T11:43:37
 F Makefile.in 0c0e53720f658c7a551046442dd7afba0b72bfbe
 F Makefile.linux-gcc 65241babba6faf1152bf86574477baab19190499
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -156,7 +156,7 @@ F src/trigger.c 724a77d54609a33bde90618934fbeddfcc729a10
 F src/update.c e89b980b443d44b68bfc0b1746cdb6308e049ac9
 F src/utf.c 4af6259d5906b5a1bf3035cc387c4d7907bdd56e
 F src/util.c 3f9c0387b54f977726790f52ab92cd3d9379b367
-F src/vacuum.c 318ccae7c4e3ddf241aeaee4d2611bfe1949a373
+F src/vacuum.c 5ec133b69edf581a232af7e2b01f45c9f2b8be32
 F src/vdbe.c 9d4d00589c174aad9a616f1615464ddddebba0ec
 F src/vdbe.h 001c5b257567c1d3de7feb2203aac71d0d7b16a3
 F src/vdbeInt.h 39fb069ce04137545ca0bc790f80ddc64a8c99d9
@@ -561,7 +561,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P a1b495c28a092c7eb79ffeeb6a217749acb4c12c
-R 9e378d30b0d2403f2a8c2ca36386519e
-U danielk1977
-Z cedf0a8ddde877cdc3adcde56bbd62a1
+P bdf5cb8d25d93d48220ce46acad2ccf967a87843
+R d4ea6f4d31089ad72edb88e7f5cbf0e5
+U drh
+Z dae02e174444912f0bfaae25113ff79b

diff --git a/manifest.uuid b/manifest.uuid
index 885530dd5a6745e168addcb1e31029073ebb76b1..5d20aafbae4b2c35aea318138793a1a2401030ff 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-bdf5cb8d25d93d48220ce46acad2ccf967a87843
\ No newline at end of file
+eb6c98fc1097b327453d7e8ec8877101ea8187c3
\ No newline at end of file

diff --git a/src/vacuum.c b/src/vacuum.c
index 8be688d44c901f47a97ef6a9fbda6491a3bb89ca..ec396c23684b6c342784c643fb29c6ff42f30cf3 100644 (file)
--- a/src/vacuum.c
+++ b/src/vacuum.c
@@ -14,7 +14,7 @@
 ** Most of the code in this file may be omitted by defining the
 ** SQLITE_OMIT_VACUUM macro.
 **
-** $Id: vacuum.c,v 1.71 2007/08/21 10:44:16 drh Exp $
+** $Id: vacuum.c,v 1.72 2007/08/24 11:43:37 drh Exp $
 */
 #include "sqliteInt.h"
 #include "vdbeInt.h"
@@ -247,9 +247,7 @@ end_of_vacuum:
   db->autoCommit = 1;
 
   if( pDb ){
-    sqlite3MallocDisallow();
     sqlite3BtreeClose(pDb->pBt);
-    sqlite3MallocAllow();
     pDb->pBt = 0;
     pDb->pSchema = 0;
   }