From: drh <drh@noemail.net>
Date: Sat, 23 Jul 2011 13:11:02 +0000 (+0000)
Subject: In the multiplexor, close auxiliary files before deleting them when doing
X-Git-Tag: version-3.7.8~38^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=11cce770424f1d76220f20a654e8c21a84757e25;p=thirdparty%2Fsqlite.git

In the multiplexor, close auxiliary files before deleting them when doing
a truncate.

FossilOrigin-Name: 6fb7cfc2efb32dd5c8921a90b853390bc44d4794
---

diff --git a/manifest b/manifest
index 42fc3e12f1..c590aa5eff 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Also\sadd\sthe\ssqlite3-all.c\starget\sto\sthe\sMSVC\smakefile.
-D 2011-07-22T11:23:49.199
+C In\sthe\smultiplexor,\sclose\sauxiliary\sfiles\sbefore\sdeleting\sthem\swhen\sdoing\na\struncate.
+D 2011-07-23T13:11:02.100
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 1e6988b3c11dee9bd5edc0c804bd4468d74a9cdc
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -213,7 +213,7 @@ F src/test_intarray.h 489edb9068bb926583445cb02589344961054207
 F src/test_journal.c 03313c693cca72959dcaaf79f8d76f21c01e19ff
 F src/test_loadext.c df586c27176e3c2cb2e099c78da67bf14379a56e
 F src/test_malloc.c 7ca7be34e0e09ef0ed6619544552ed95732e41f6
-F src/test_multiplex.c 991a60733dbde8c529043d466c5c44d180762561
+F src/test_multiplex.c 731fb740a9fd4b11cb7b1990c62fc88d01c90dfd
 F src/test_multiplex.h e99c571bc4968b7a9363b661481f3934bfead61d
 F src/test_mutex.c a6bd7b9cf6e19d989e31392b06ac8d189f0d573e
 F src/test_onefile.c 40cf9e212a377a6511469384a64b01e6e34b2eec
@@ -952,7 +952,7 @@ F tool/symbols.sh caaf6ccc7300fd43353318b44524853e222557d5
 F tool/tostr.awk 11760e1b94a5d3dcd42378f3cc18544c06cfa576
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings.sh 2ebae31e1eb352696f3c2f7706a34c084b28c262
-P 71f7be586f5a18493cd516f89c4ecc460bb24462
-R 645e7d58a7503109e1bb3e986974849f
+P 8ce2b74a82264550b0e19da3e0e1a145db940a1c
+R 5ff3917e6e15573461029ec08177c1a8
 U drh
-Z aaeed83d2a39a45645a69e9a638df017
+Z 73fb0245292065880727bc255b6bd8fa
diff --git a/manifest.uuid b/manifest.uuid
index e12fc96311..06036314cf 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8ce2b74a82264550b0e19da3e0e1a145db940a1c
\ No newline at end of file
+6fb7cfc2efb32dd5c8921a90b853390bc44d4794
\ No newline at end of file
diff --git a/src/test_multiplex.c b/src/test_multiplex.c
index 732df82cd7..d316847945 100644
--- a/src/test_multiplex.c
+++ b/src/test_multiplex.c
@@ -414,8 +414,8 @@ static void multiplexSubClose(
 ){
   sqlite3_file *pSubOpen = pGroup->aReal[iChunk].p;
   if( pSubOpen ){
-    if( pOrigVfs ) pOrigVfs->xDelete(pOrigVfs, pGroup->aReal[iChunk].z, 0);
     pSubOpen->pMethods->xClose(pSubOpen);
+    if( pOrigVfs ) pOrigVfs->xDelete(pOrigVfs, pGroup->aReal[iChunk].z, 0);
     sqlite3_free(pGroup->aReal[iChunk].p);
   }
   sqlite3_free(pGroup->aReal[iChunk].z);