Cherry-pick the fix to surplus overflow files in the multiplexor,

check-in [1238619756c0c] in the trunk.

FossilOrigin-Name: 2f8c62c3378a702fa623a2880a989d958eece0df

diff --git a/manifest b/manifest
index 8348cbd8360533de335eb2fa6968c619eac2f79d..1619acc61420c69246f869304d5330cf82de8bd7 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Cherry-pick\sthe\sSQLITE_DIRECT_OVERFLOW_READ\sfix\sfor\sticket\n[ac0ff496b7e3]\sof\schanges\s[c5256b59ad]\sand\s[c723e3e18a]\s\ninto\sthe\snx-devkit\sbranch.
-D 2011-12-21T23:38:21.467
+C Cherry-pick\sthe\sfix\sto\ssurplus\soverflow\sfiles\sin\sthe\smultiplexor,\ncheck-in\s[1238619756c0c]\sin\sthe\strunk.
+D 2012-01-09T14:57:38.826
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5b4a3e12a850b021547e43daf886b25133b44c07
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -214,7 +214,7 @@ F src/test_intarray.h 489edb9068bb926583445cb02589344961054207
 F src/test_journal.c 2c06e4be6584d51b935dc8b353980a9388de62ef
 F src/test_loadext.c df586c27176e3c2cb2e099c78da67bf14379a56e
 F src/test_malloc.c 8d416f29ad8573f32601f6056c9d2b17472e9ad5
-F src/test_multiplex.c 6e07b94e2fe430f7f4f0d7d67b5e58f504dea655
+F src/test_multiplex.c 8e8a4211976291af4173b403728ac44e27126894
 F src/test_multiplex.h e99c571bc4968b7a9363b661481f3934bfead61d
 F src/test_mutex.c a6bd7b9cf6e19d989e31392b06ac8d189f0d573e
 F src/test_onefile.c 40cf9e212a377a6511469384a64b01e6e34b2eec
@@ -606,7 +606,7 @@ F test/misc5.test 528468b26d03303b1f047146e5eefc941b9069f5
 F test/misc6.test 953cc693924d88e6117aeba16f46f0bf5abede91
 F test/misc7.test eafaa41b9133d7a2ded4641bbe5f340731d35a52
 F test/misuse.test ba4fb5d1a6101d1c171ea38b3c613d0661c83054
-F test/multiplex.test 8bc3c71f73fe833bc8a659d454d320044a33b5da
+F test/multiplex.test e08cc7177bd6d85990ee1d71100bb6c684c02256
 F test/multiplex2.test 896ff138d27688b68c894b8166606454ce915793
 F test/multiplex3.test e17b73e904dbd789de37192b6b94424e6f847bc3
 F test/mutex1.test 78b2b9bb320e51d156c4efdb71b99b051e7a4b41
@@ -979,7 +979,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
-P bb40338887c912be70cb6fe3b760d87c14bb88a5
-R 041cbd9cee36a582791819872d3229da
+P 42f31f190a0ac971fa0ee361fe4c175f479c75e3
+R 33443288608b606d75feb07d292cfeb5
 U drh
-Z f97894b580cddabcc04be599aee7b3e7
+Z ff62211e5ddd93259287a913f2fd089b

diff --git a/manifest.uuid b/manifest.uuid
index 81d4e3eee69fbe3571512ff70ecfe2ba2b135c59..5c60c15d949193f136ea84beb298f39b6084f683 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-42f31f190a0ac971fa0ee361fe4c175f479c75e3
\ No newline at end of file
+2f8c62c3378a702fa623a2880a989d958eece0df
\ No newline at end of file

diff --git a/src/test_multiplex.c b/src/test_multiplex.c
index 25bfcdddd2bd5636b88c978b392d4d05fce1ffd5..34277361a1b6abda0eda1559e6afa5bf05b51790 100644 (file)
--- a/src/test_multiplex.c
+++ b/src/test_multiplex.c
@@ -306,7 +306,6 @@ static sqlite3_file *multiplexSubOpen(
   *rc = multiplexSubFilename(pGroup, iChunk);
   if( (*rc)==SQLITE_OK && (pSubOpen = pGroup->aReal[iChunk].p)==0 ){
     int flags, bExists;
-    createFlag = (pGroup->flags & SQLITE_OPEN_CREATE)!=0;
     flags = pGroup->flags;
     if( createFlag ){
       flags |= SQLITE_OPEN_CREATE;

diff --git a/test/multiplex.test b/test/multiplex.test
index 7168e753ab1f434b67a8f5c3ec32e23417014075..32c87d9a52ac92915d2962ce4e6904500c8c661a 100644 (file)
--- a/test/multiplex.test
+++ b/test/multiplex.test
@@ -156,6 +156,9 @@ sqlite3_multiplex_initialize "" 1
 multiplex_set db main 32768 16
 
 forcedelete test.x
+foreach f [glob -nocomplain {test.x*[0-9][0-9][0-9]}] {
+  forcedelete $f
+}
 do_test multiplex-2.1.2 {
   sqlite3 db test.x
   execsql {
@@ -192,12 +195,17 @@ do_test multiplex-2.4.2 {
   execsql { INSERT INTO t1 VALUES(3, randomblob(1100)) }
 } {}
 do_test multiplex-2.4.4 { file size [multiplex_name test.x 0] } {7168}
-do_test multiplex-2.4.99 {
+do_test multiplex-2.4.5 {
+  db close
+  sqlite3 db test.x
+  db eval vacuum
   db close
+  glob test.x*
+} {test.x}
+do_test multiplex-2.4.99 {
   sqlite3_multiplex_shutdown
 } {SQLITE_OK}
 
-
 do_test multiplex-2.5.1 {
   multiplex_delete test.x
   sqlite3_multiplex_initialize "" 1