From: drh <drh@noemail.net>
Date: Wed, 14 Dec 2011 18:33:13 +0000 (+0000)
Subject: Merge the nx-devkit changes into trunk.  This includes the new
X-Git-Tag: mountain-lion~8^2~39
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a60ef3d570073cc78c066442d23ec7cd9453ee55;p=thirdparty%2Fsqlite.git

Merge the nx-devkit changes into trunk.  This includes the new
SQLITE_FCNTL_VFSNAME file-control.

FossilOrigin-Name: da118e02c0576ce16f7a26663f59413316223d55
---

a60ef3d570073cc78c066442d23ec7cd9453ee55
diff --cc manifest
index 7ebd8e4a88,e9459b2243..6fcb03d694
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Treat\sa\szero\sreturn\svalue\sfrom\sthe\sWin32\sAPIs\sMultiByteToWideChar\sand\sWideCharToMultiByte\sas\san\serror\scondition.
- D 2011-12-14T00:37:45.399
 -C Merge\sthe\sVFSNAME\sfile-control\saddition\sinto\sthe\snx-devkit\sbranch.
 -D 2011-12-14T18:28:18.920
++C Merge\sthe\snx-devkit\schanges\sinto\strunk.\s\sThis\sincludes\sthe\snew\nSQLITE_FCNTL_VFSNAME\sfile-control.
++D 2011-12-14T18:33:13.731
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 5b4a3e12a850b021547e43daf886b25133b44c07
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -147,10 -147,10 +147,10 @@@ F src/journal.c 552839e54d1bf76fb8f7abe
  F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f
  F src/lempar.c 0ee69fca0be54cd93939df98d2aca4ca46f44416
  F src/loadext.c f20382fbaeec832438a1ba7797bee3d3c8a6d51d
- F src/main.c b4c74ff20abd393b14b3cf7b2130758e2187a5b2
 -F src/main.c e7e6985365795ef6c500d05d766222222efbb0ac
++F src/main.c c837e24182e8ec7121c61e44f547b59cbe413e7f
  F src/malloc.c 591aedb20ae40813f1045f2ef253438a334775d9
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 -F src/mem1.c 7456e2ca0524609ebc06a9befeda5289d4575ad4
 +F src/mem1.c 7998e7003a3047e323c849a26dda004debc04d03
  F src/mem2.c e307323e86b5da1853d7111b68fd6b84ad6f09cf
  F src/mem3.c 61c9d47b792908c532ca3a62b999cf21795c6534
  F src/mem5.c c2c63b7067570b00bf33d751c39af24182316f7f
@@@ -163,33 -163,33 +163,33 @@@ F src/mutex_unix.c b4f4e923bb8de93ec3f2
  F src/mutex_w32.c 5e54f3ba275bcb5d00248b8c23107df2e2f73e33
  F src/notify.c 976dd0f6171d4588e89e874fcc765e92914b6d30
  F src/os.c 28bbdab2170dfce84d86c45456a18eab1d0f99a9
 -F src/os.h 9dbed8c2b9c1f2f2ebabc09e49829d4777c26bf9
 +F src/os.h 549b1a2e5e0ed1e1499f252dac126c4973e7379c
  F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
  F src/os_os2.c 4a75888ba3dfc820ad5e8177025972d74d7f2440
- F src/os_unix.c dcb42d74044efcf760c3c03c668e9e7314aa2427
- F src/os_win.c 745cfae00e887ba90452f7ef2a245272c4ed7374
 -F src/os_unix.c baad28b27adc563579170b6d765af0b0cc1d98c8
 -F src/os_win.c 823f55855ceb062d72231409b828d0486f09125f
++F src/os_unix.c 7dc7df10331942b139032328449a3723e051979e
++F src/os_win.c 197d23ce8a0dff748e766e034bf95ff756dd3884
  F src/pager.c d981f3bfcc0e4460537d983899620700ccf8f539
  F src/pager.h 5cd760857707529b403837d813d86b68938d6183
 -F src/parse.y 12b7ebd61ea54f0e1b1083ff69cc2c8ce9353d58
 +F src/parse.y fabb2e7047417d840e6fdb3ef0988a86849a08ba
  F src/pcache.c 1fdd77978c1525d1ca4b9ef48eb80abca710cb4c
  F src/pcache.h b1d8775a9bddf44e65edb0d20bfc57a4982f840f
  F src/pcache1.c 9d735349ac87ef08076c6b1230f04cd83b15c6da
  F src/pragma.c dd66f21fafe7be40e1a48ad4195764cc191cf583
  F src/prepare.c ec4989f7f480544bdc4192fe663470d2a2d7d61e
 -F src/printf.c 03104cbff6959ff45df69dc9060ba6212f60a869
 +F src/printf.c 7ffb4ebb8b341f67e049695ba031da717b3d2699
  F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
 -F src/resolve.c 365ab1c870e38596d6869e76fb544fe6e4ffc809
 +F src/resolve.c 3d3e80a98f203ac6b9329e9621e29eda85ddfd40
  F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
 -F src/select.c 80f3ac44a8514b1d107b80f5df4a424ae059d2b6
 -F src/shell.c 670644f7bd82073ce0c97c6bff94be04c326beb8
 -F src/sqlite.h.in 84cd7be33f5bf39329e018f93eb34b4a345c9c23
 +F src/select.c a1d075db66a0ea42807353501b62997969e5be79
- F src/shell.c ea9c11ae5dbe32b9f0a779b96f6b351293b8e638
- F src/sqlite.h.in 1dc07194eb1a2c69c8ef75f88022b170be08024a
++F src/shell.c aa4183d4a5243d8110b1d3d77faa4aea7e9c9c2d
++F src/sqlite.h.in e3e45b5c69ab3236c7ec4591a5858221863cecd4
  F src/sqlite3ext.h 6904f4aadf976f95241311fbffb00823075d9477
 -F src/sqliteInt.h f412e020e1009163c74be56eaac1bf7f6c0a4515
 +F src/sqliteInt.h 165409fa8adc8701148830804febeded3f2e4448
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 4568e72dfd36b6a5911f93457364deb072e0b03a
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
  F src/tclsqlite.c de581e2e71f5e7f98366156afad83b4742ac6fe0
- F src/test1.c fe455fc1be1b0dbf4ce45b11c255900e8ae18da3
 -F src/test1.c d019682c4480d612e4eca73412011a120e1468db
++F src/test1.c 33b9c49f728cf28937eea7b246c28e89e3cf5e9e
  F src/test2.c 80d323d11e909cf0eb1b6fbb4ac22276483bcf31
  F src/test3.c 124ff9735fb6bb7d41de180d6bac90e7b1509432
  F src/test4.c d1e5a5e904d4b444cf572391fdcb017638e36ff7
@@@ -606,8 -606,8 +606,8 @@@ F test/misc6.test 953cc693924d88e6117ae
  F test/misc7.test eafaa41b9133d7a2ded4641bbe5f340731d35a52
  F test/misuse.test ba4fb5d1a6101d1c171ea38b3c613d0661c83054
  F test/multiplex.test 8bc3c71f73fe833bc8a659d454d320044a33b5da
 -F test/multiplex2.test 896ff138d27688b68c894b8166606454ce915793
 -F test/multiplex3.test e17b73e904dbd789de37192b6b94424e6f847bc3
 +F test/multiplex2.test 580ca5817c7edbe4cc68fa150609c9473393003a
- F test/multiplex3.test cbc0d03da5fcd0c18a33a8973ef1df1b4bc2100a
++F test/multiplex3.test 15903c343f1eaa4b00998b7ceacfc4987e4ccfe9
  F test/mutex1.test 78b2b9bb320e51d156c4efdb71b99b051e7a4b41
  F test/mutex2.test bfeaeac2e73095b2ac32285d2756e3a65e681660
  F test/nan.test e9648b9d007c7045242af35e11a984d4b169443a
@@@ -980,7 -978,7 +980,7 @@@ F tool/tostr.awk e75472c2f98dd76e06b8c9
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
- P 03a70c3dae8d912fccd9d72c575dc372b198d238
- R 29870a4086be96ebc531e67fe7235bdd
- U mistachkin
- Z fc2bb105d27bbafb8656bcd186800dc4
 -P 08bbbd8e38697908ab8ae0f6b512d01c32f7e4da cdbfb553af02d10767a905489d9dfc57fc6be54e
 -R d213e3c5e90076919d50d6149e76976e
++P c65e5a36f1a1c91cb3415158ebe0f5759cbcdf96 08c1dc517c1340737a55ad9012b7b06f72899c6f
++R 2cdc49e30cc728bae752e402fff2c131
+ U drh
 -Z 8e788ffb68fb72b933914781f94a7874
++Z 5856c8e102de685918e2741a72465352
diff --cc manifest.uuid
index 5678b5737e,d03e81ee9a..ab55230bd6
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- c65e5a36f1a1c91cb3415158ebe0f5759cbcdf96
 -08c1dc517c1340737a55ad9012b7b06f72899c6f
++da118e02c0576ce16f7a26663f59413316223d55