From: drh <drh@noemail.net>
Date: Mon, 8 Apr 2013 14:41:34 +0000 (+0000)
Subject: Merge the multi-process tester into trunk.
X-Git-Tag: version-3.7.17~105
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=554052c600f180ba1e23cc44b0598e8f19860de9;p=thirdparty%2Fsqlite.git

Merge the multi-process tester into trunk.

FossilOrigin-Name: ea53c45d79772986d2ad289f4f56f333541747e7
---

554052c600f180ba1e23cc44b0598e8f19860de9
diff --cc manifest
index 20d73d0f91,7acc35ecdc..c64575a45a
--- a/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Fix\san\sincorrect\stype\scast\sin\san\sassignment\sin\svdbe.c.
- D 2013-04-08T10:38:57.721
 -C Add\sthe\s"mptester"\starget\sto\sthe\smakefiles.\s\sMake\smptester\srun\swith\nsynchronous\soff\sby\sdefault.
 -D 2013-04-08T14:28:33.142
++C Merge\sthe\smulti-process\stester\sinto\strunk.
++D 2013-04-08T14:41:34.434
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in aafa71d66bab7e87fb2f348152340645f79f0244
+ F Makefile.in 6a6a8c548822302d3a9a651f0296bbc3dad55e83
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc 9ab787d472c9cb8bad29c2c4aeba15b06fba7bc4
+ F Makefile.msc a244e5b5ba2493625db95b4d46b79201ea868bfe
  F Makefile.vxworks db21ed42a01d5740e656b16f92cb5d8d5e5dd315
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
  F VERSION 05c7bd63b96f31cfdef5c766ed91307ac121f5aa
@@@ -110,6 -110,9 +110,10 @@@ F mkextw.sh 4123480947681d9b434a5e7b1ee
  F mkopcodec.awk f6fccee29e68493bfd90a2e0466ede5fa94dd2fc
  F mkopcodeh.awk 29b84656502eee5f444c3147f331ee686956ab0e
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
+ F mptest/config01.test 3f4ddeb152a4f83872f0fa7fcb48d9fd609893da
++F mptest/config02.test 381ec0acbb1e5aab28ca9aa91e17ae9a02bbd2bb
+ F mptest/mptest.c 739950807a48af97fb3e432256fef96540d0e936
+ F mptest/multiwrite01.test aef0af17f1ce1beacd158e403a45a21008d7a70c
  F spec.template 86a4a43b99ebb3e75e6b9a735d5fd293a24e90ca
  F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
  F sqlite3.1 6be1ad09113570e1fc8dcaff84c9b0b337db5ffc
@@@ -1044,7 -1047,7 +1048,7 @@@ F tool/vdbe-compress.tcl f12c884766bd14
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
  F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
- P c1d7304c80c4a6244c8a9f6fad1eebd0f339c724
- R 9455b151c7a6a645888f7422c4787f65
- U dan
- Z 3be6f6ee1162b72435a62041d8441b1f
 -P 59bdbb10ed67bf79e0991e2ad58a28321dedb959
 -R 1f9c112eec8d81ff124d0eb10d39eea3
++P 320b5295da57023399c7b9eed82eae40cf619803 1397830bfead3699a7e6b1858ae67ae15259b89e
++R 518213540ee221b372b2870b99865f42
+ U drh
 -Z 523cf56f3e6158426b3e246d7dff8e8c
++Z 23b5a3829f6928c651f9b0e92776d749
diff --cc manifest.uuid
index 8700cad9be,dbce6398ba..2449f90305
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 320b5295da57023399c7b9eed82eae40cf619803
 -1397830bfead3699a7e6b1858ae67ae15259b89e
++ea53c45d79772986d2ad289f4f56f333541747e7
diff --cc mptest/config02.test
index 0000000000,0000000000..70c3a6cac2
new file mode 100644
--- /dev/null
+++ b/mptest/config02.test
@@@ -1,0 -1,0 +1,105 @@@
++/*
++** Configure five tasks in different ways, then run tests.
++*/
++PRAGMA page_size=512;
++--task 1
++  PRAGMA mmap_limit=0;
++--end
++--task 2
++  PRAGMA mmap_limit=28672;
++--end
++--task 3
++  PRAGMA mmap_limit=8192;
++--end
++--task 4
++  PRAGMA mmap_limit=65536;
++--end
++--source multiwrite01.test
++PRAGMA page_size=1024;
++VACUUM;
++CREATE TABLE pgsz(taskid, sz INTEGER);
++--task 1
++  INSERT INTO pgsz VALUES(1, eval('PRAGMA page_size'));
++--end
++--task 2
++  INSERT INTO pgsz VALUES(2, eval('PRAGMA page_size'));
++--end
++--task 3
++  INSERT INTO pgsz VALUES(3, eval('PRAGMA page_size'));
++--end
++--task 4
++  INSERT INTO pgsz VALUES(4, eval('PRAGMA page_size'));
++--end
++--task 5
++  INSERT INTO pgsz VALUES(5, eval('PRAGMA page_size'));
++--end
++--source multiwrite01.test
++--wait all
++SELECT sz FROM pgsz;
++--match 1024 1024 1024 1024 1024
++PRAGMA page_size=2048;
++VACUUM;
++DELETE FROM pgsz;
++--task 1
++  INSERT INTO pgsz VALUES(1, eval('PRAGMA page_size'));
++--end
++--task 2
++  INSERT INTO pgsz VALUES(2, eval('PRAGMA page_size'));
++--end
++--task 3
++  INSERT INTO pgsz VALUES(3, eval('PRAGMA page_size'));
++--end
++--task 4
++  INSERT INTO pgsz VALUES(4, eval('PRAGMA page_size'));
++--end
++--task 5
++  INSERT INTO pgsz VALUES(5, eval('PRAGMA page_size'));
++--end
++--source multiwrite01.test
++--wait all
++SELECT sz FROM pgsz;
++--match 2048 2048 2048 2048 2048
++PRAGMA page_size=8192;
++VACUUM;
++DELETE FROM pgsz;
++--task 1
++  INSERT INTO pgsz VALUES(1, eval('PRAGMA page_size'));
++--end
++--task 2
++  INSERT INTO pgsz VALUES(2, eval('PRAGMA page_size'));
++--end
++--task 3
++  INSERT INTO pgsz VALUES(3, eval('PRAGMA page_size'));
++--end
++--task 4
++  INSERT INTO pgsz VALUES(4, eval('PRAGMA page_size'));
++--end
++--task 5
++  INSERT INTO pgsz VALUES(5, eval('PRAGMA page_size'));
++--end
++--source multiwrite01.test
++--wait all
++SELECT sz FROM pgsz;
++--match 8192 8192 8192 8192 8192
++PRAGMA page_size=16384;
++VACUUM;
++DELETE FROM pgsz;
++--task 1
++  INSERT INTO pgsz VALUES(1, eval('PRAGMA page_size'));
++--end
++--task 2
++  INSERT INTO pgsz VALUES(2, eval('PRAGMA page_size'));
++--end
++--task 3
++  INSERT INTO pgsz VALUES(3, eval('PRAGMA page_size'));
++--end
++--task 4
++  INSERT INTO pgsz VALUES(4, eval('PRAGMA page_size'));
++--end
++--task 5
++  INSERT INTO pgsz VALUES(5, eval('PRAGMA page_size'));
++--end
++--source multiwrite01.test
++--wait all
++SELECT sz FROM pgsz;
++--match 16384 16384 16384 16384 16384