Merge the syscall-override changes into trunk.

FossilOrigin-Name: 36d79e6f54cdc4129c6e6366a49722e2cf1cccbd

diff --cc manifest
index 5e56fbba6c10b483b305bd28628c15e5a83b8783,a064a0b5e51f6b713865a10653e3f9190d78833b..d1be39e105873125f52124a1ac3aecd93c21241e
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
  -----BEGIN PGP SIGNED MESSAGE-----
  Hash: SHA1
  
- C Unix\serrno\sinteger\scan\svary\sfrom\sone\ssystem\sto\sthe\snext.\s\sSo\sdo\snot\ndepend\son\sspecific\serrno\svalues\sin\stest\scases.
- D 2011-03-08T14:05:07.476
 -C Handle\sEINTR\serrors\sfrom\sopen().
 -D 2011-03-04T15:43:57.699
++C Merge\sthe\ssyscall-override\schanges\sinto\strunk.
++D 2011-03-08T16:39:29.275
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 27701a1653595a1f2187dc61c8117e00a6c1d50f
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -165,8 -165,8 +165,8 @@@ F src/os.c 22ac61d06e72a0dac90040014733
  F src/os.h 9dbed8c2b9c1f2f2ebabc09e49829d4777c26bf9
  F src/os_common.h a8f95b81eca8a1ab8593d23e94f8a35f35d4078f
  F src/os_os2.c 2e452c9f2ca507623ad351c33a8a8b27849b1863
- F src/os_unix.c 67f9a304641f126f5f7326cd452c2df3d9a4d512
- F src/os_win.c 9abdcdd925416d854eabb0996c96debd92abfef5
 -F src/os_unix.c cb94e52f705b8e0ae2b2ddd387f71d6c4e08cd71
++F src/os_unix.c 58fe8845678f6a4e30ed6988c5df7327bc7bd69b
+ F src/os_win.c 24d72407a90551969744cf9bcbb1b4c72c5fa845
  F src/pager.c 6aa906b60a59664ba58d3f746164bb010d407ce1
  F src/pager.h 3f8c783de1d4706b40b1ac15b64f5f896bcc78d1
  F src/parse.y 12b7ebd61ea54f0e1b1083ff69cc2c8ce9353d58
@@@ -181,9 -181,9 +181,9 @@@ F src/resolve.c 1c0f32b64f8e3f555fe1f73
  F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
  F src/select.c d24406c45dd2442eb2eeaac413439066b149c944
  F src/shell.c 649c51979812f77f97507024a4cea480c6862b8b
- F src/sqlite.h.in ccb23cc9378874c7c72682b739f311474a80848d
 -F src/sqlite.h.in 660a7db4b052f0e390842fcaae49e3de5e10194d
++F src/sqlite.h.in 82274d7f4440b99a80d8cc4f077547fd0b596017
  F src/sqlite3ext.h c90bd5507099f62043832d73f6425d8d5c5da754
 -F src/sqliteInt.h 4290fff17fabc6e07fc4338233df0e39e6350ca1
 +F src/sqliteInt.h 2cea3e47997e3f4d9b4f1ce62f99c35be1b5a586
  F src/sqliteLimit.h a17dcd3fb775d63b64a43a55c54cb282f9726f44
  F src/status.c 4997380fbb915426fef9e500b4872e79c99267fc
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -914,14 -913,14 +914,14 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P c829868aa2254c5e2268cdb803462cc6ec5cb71e
- R 8e95dcc047fadda9627799dfff537929
 -P 38558363494e3a736dcb091dd859e76b7ccd78b0
 -R dd2dabc15bf7d4925fef6d097c8b1859
++P ddb747d33a004c7fe532a661e879ccba68c79c59 a7d176b27cd73791d45eb3a31df78187ae10ce20
++R f6d9df8153eea975bd4c019ada4938a6
  U drh
- Z 37a2076ebac96d581357fbed13c5025e
 -Z 534640ef6b55077422a57e880c660f80
++Z a4115902c8e36dff16feb9c6102d7895
  -----BEGIN PGP SIGNATURE-----
  Version: GnuPG v1.4.6 (GNU/Linux)
  
- iD8DBQFNdjeWoxKgR168RlERAqe0AJ0VGxcf5Ph+FO32DM9O7OJzqJKoKgCgi6Pc
- n0W6zXncDy5KyrZP5XyTfdc=
- =lDvF
 -iD8DBQFNcQjAoxKgR168RlERAg0SAJ9rCSURrs0OHohp+icweWOPgtvSxQCdHnS5
 -3mAQcVk63NipJkS+azKbo50=
 -=vPdf
++iD8DBQFNdlvEoxKgR168RlERAqctAJ0QkDzaXcGb8cYDn6Z1juSfygSdZgCcCoJg
++HYxK6HQIevTUFNLB5q3ux8E=
++=p3yO
  -----END PGP SIGNATURE-----

diff --cc manifest.uuid
index 2cb1327c66c145d0fecda22d804b836eb0c01bb8,49190d153575c6b8a311b637be61dbcfe4212e96..feb46f5c9228abb277435cc4f5a6f92653ad7250
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- ddb747d33a004c7fe532a661e879ccba68c79c59
 -a7d176b27cd73791d45eb3a31df78187ae10ce20
++36d79e6f54cdc4129c6e6366a49722e2cf1cccbd

diff --cc src/os_unix.c
Simple merge

diff --cc src/sqlite.h.in
index 3400c6c9169256a6f1d0ba31a453c46628def2db,e2332466f839d34fdb7cf9223939b0465b6ce47b..ebabee8ed7c2077532611e603eab525204fabfb3
--- 1/src/sqlite.h.in
--- 2/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@@ -893,6 -893,6 +893,18 @@@ typedef struct sqlite3_mutex sqlite3_mu
  ** date and time if that method is available (if iVersion is 2 or 
  ** greater and the function pointer is not NULL) and will fall back
  ** to xCurrentTime() if xCurrentTimeInt64() is unavailable.
++**
++** ^The xSetSystemCall(), xGetSystemCall(), and xNestSystemCall() interfaces
++** are not used by the SQLite core.  These optional interfaces are provided
++** by some VFSes to facilitate testing of the VFS code. By overriding 
++** system calls with functions under its control, a test program can
++** simulate faults and error conditions that would otherwise be difficult
++** or impossible to induce.  The set of system calls that can be overridden
++** varies from one VFS to another, and from one version of the same VFS to the
++** next.  Applications that use these interfaces must be prepared for any
++** or all of these interfaces to be NULL or for their behavior to change
++** from one release to the next.  Applications must not attempt to access
++** any of these methods if the iVersion of the VFS is less than 3.
  */
  typedef struct sqlite3_vfs sqlite3_vfs;
  struct sqlite3_vfs {