Merge updates from trunk.

FossilOrigin-Name: 224c65e4a5c6ede076c364c93933cedd17f1e70b

diff --cc manifest
index 44371ce294ad835102ba948e8eda6f3129ba47dc,68138a320dc6b2c246aaf4c74735ffd4134f2707..fe1e3bd3bf4b63022cdec947f85248e9378a1c79
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\sthe\stable\sconstraint\sparser\sfixes\sfrom\strunk.
- D 2012-05-10T13:03:28.296
 -C Add\sassert()s\sto\sverify\sthat\sTable\sobjects\sin\sthe\sschema\snever\suse\nlookaside\smemory.
 -D 2012-05-15T12:49:32.294
++C Merge\supdates\sfrom\strunk.
++D 2012-05-17T21:04:26.516
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 2f37e468503dbe79d35c9f6dffcf3fae1ae9ec20
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -121,10 -121,10 +121,10 @@@ F src/btmutex.c 976f45a12e37293e32cae02
  F src/btree.c df800f10896bc2ddaa1125c532d6e7a7b9efc532
  F src/btree.h 48a013f8964f12d944d90e4700df47b72dd6d923
  F src/btreeInt.h 38a639c0542c29fe8331a221c4aed0cb8686249e
- F src/build.c 987c6933ea170e443dc6a79d52f8d2506206b12b
+ F src/build.c 95fd8aa1bf81acf15e9ef46b07d1f70111ea88d0
  F src/callback.c 0cb4228cdcd827dcc5def98fb099edcc9142dbcd
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
 -F src/ctime.c a9c26822515f81ec21588cbb482ca6724be02e33
 +F src/ctime.c 500d019da966631ad957c37705642be87524463b
  F src/date.c 067a81c9942c497aafd2c260e13add8a7d0c7dd4
  F src/delete.c 4c20ea4f6213b3bc1c6a510586864b679946e05e
  F src/expr.c eefabaa4a3dc67309a754eb0eab1a163ff4c2bf3
@@@ -160,22 -160,22 +160,22 @@@ F src/os.h 38aabd5e3ecd4162332076f55bb0
  F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
  F src/os_os2.c 4a75888ba3dfc820ad5e8177025972d74d7f2440
  F src/os_unix.c 424d46e0edab969293c2223f09923b2178171f47
- F src/os_win.c ce348d158b43883c5b1495f68be3f654b7d0c503
 -F src/os_win.c 412d6434133c7c81dc48b7702f3ea5e61c309e5c
++F src/os_win.c 37e1b92f0fa5edf1955bcd6b04d3e4d8be68ede2
  F src/pager.c bb5635dde0b152797836d1c72275284724bb563c
  F src/pager.h ef1eaf8593e78f73885c1dfac27ad83bee23bdc5
- F src/parse.y de06f412a4b3a2978071215f657fd1cd70700444
+ F src/parse.y f29df90bd3adc64b33114ab1de9fb7768fcf2099
  F src/pcache.c f8043b433a57aba85384a531e3937a804432a346
  F src/pcache.h 1b5dcc3dc8103d03e625b177023ee67764fa6b7c
  F src/pcache1.c b30b1c35908346ecc43d8d9d17f2ddf6817f8f60
 -F src/pragma.c e708b3bb5704605816f617e0b1d63a5488060715
 +F src/pragma.c 149d8400ff783741d41389176832241cbff8f856
- F src/prepare.c ec4989f7f480544bdc4192fe663470d2a2d7d61e
+ F src/prepare.c 9a00a9612ebf80203fbb41f8a29ab8cb27a05f40
  F src/printf.c 7ffb4ebb8b341f67e049695ba031da717b3d2699
  F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
  F src/resolve.c 748e75299faff345f34f0e5bd02a2bac8aa69fcd
  F src/rowset.c f6a49f3e9579428024662f6e2931832511f831a1
  F src/select.c d7b9018b7dd2e821183d69477ab55c39b8272335
  F src/shell.c 04399b2f9942bd02ed5ffee3b84bcdb39c52a1e6
- F src/sqlite.h.in 457e6fb1eef84fbd97864c086499b1de64a05aa5
 -F src/sqlite.h.in 4f4d4792f6fb00387c877af013cb09d955643f12
++F src/sqlite.h.in 51b406bc156dcdfbb2af45ba11555256f23937be
  F src/sqlite3ext.h 6904f4aadf976f95241311fbffb00823075d9477
  F src/sqliteInt.h c5e917c4f1453f3972b1fd0c81105dfe4f09cc32
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
@@@ -625,7 -625,7 +625,7 @@@ F test/notnull.test cc7c78340328e6112a1
  F test/null.test a8b09b8ed87852742343b33441a9240022108993
  F test/openv2.test 0d3040974bf402e19b7df4b783e447289d7ab394
  F test/oserror.test 50417780d0e0d7cd23cf12a8277bb44024765df3
- F test/pager1.test 819a0ecc0ecf4850155cf18dcd2754121d1018b3
 -F test/pager1.test 31fef8ff6d5cbb4643f430e31756312d361ecfdf
++F test/pager1.test 2163c6ef119f497a71a84137c957c63763e640ab
  F test/pager2.test 745b911dde3d1f24ae0870bd433dfa83d7c658c1
  F test/pager3.test 3856d9c80839be0668efee1b74811b1b7f7fc95f
  F test/pagerfault.test 452f2cc23e3bfcfa935f4442aec1da4fe1dc0442
@@@ -726,7 -726,7 +726,7 @@@ F test/tclsqlite.test 1597d353308531527
  F test/tempdb.test 19d0f66e2e3eeffd68661a11c83ba5e6ace9128c
  F test/temptable.test 51edd31c65ed1560dd600b1796e8325df96318e2
  F test/temptrigger.test 26670ed7a39cf2296a7f0a9e0a1d7bdb7abe936d
- F test/tester.tcl e1e5d5bc3453338ec7fded894614e059a5ce2c6a
 -F test/tester.tcl a55e066251bc05e26f9da00e76644ab649b26f3c
++F test/tester.tcl 2665f64c9ce71944b4d41269114e658fb81bda05
  F test/thread001.test 7cc2ce08f9cde95964736d11e91f9ab610f82f91
  F test/thread002.test e630504f8a06c00bf8bbe68528774dd96aeb2e58
  F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@@ -916,8 -917,8 +917,8 @@@ F test/vtabF.test fd5ad376f5a34fe0891df
  F test/vtab_alter.test 9e374885248f69e251bdaacf480b04a197f125e5
  F test/vtab_err.test 0d4d8eb4def1d053ac7c5050df3024fd47a3fbd8
  F test/vtab_shared.test 82f463886e18d7f8395a4b6167c91815efe54839
- F test/wal.test 99394a4c0310a1a44693512ce620f1b73dafd3ec
- F test/wal2.test 8871e7fd2c86711ff415a5817d68ea3101a15312
 -F test/wal.test b3d28d655371bf3f6500c679f526e9860544fe70
++F test/wal.test a040047d7f2b9f34bc4d597964e5e7c09609c635
+ F test/wal2.test d5021064bebfc717fe2bf4db2536ea030b76a773
  F test/wal3.test 6504bbf348b2d6dfade64a064f1050fd617e8706
  F test/wal4.test 4744e155cd6299c6bd99d3eab1c82f77db9cdb3c
  F test/wal5.test f58ed4b8b542f71c7441da12fbd769d99b362437
@@@ -996,7 -997,7 +997,7 @@@ F tool/tostr.awk e75472c2f98dd76e06b8c9
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings-clang.sh a8a0a3babda96dfb1ff51adda3cbbf3dfb7266c2
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
- P 0d8b920b2c195f3735608e7a08f5d23724cdf806 38bf90af1ede6ee64ef7be66392e895e60c9126e
- R 81f25e7b03bf459323ea9dac500cee2e
 -P 0bb1cfc63f982db7b29c8e6be6698a6dad100f70
 -R 040b7c6409bc9c8d46165baae8f02a6f
--U drh
- Z ac42bf5c0e1cb57eb129f61107981da1
 -Z 46fb04131884f3e5ee0e8870b1bd5af5
++P 12bb31dd6f0d8544406710d6f02f0b7c0fe6c537 736d6ea677f58e4aa2914fa79a3156b775c5a3f5
++R fe82a7de8d73461a6ba87765ea326828
++U mistachkin
++Z 229fa5a08bef71b3184983513b25255b

diff --cc manifest.uuid
index 181609fbfed852fa2731b9ba3b7abae368d8e861,d1f1a9b991f2edb81e95abe9314c392849d00570..2db95ff85872afab9bd3909c9b8235fcfc2af225
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 12bb31dd6f0d8544406710d6f02f0b7c0fe6c537
 -736d6ea677f58e4aa2914fa79a3156b775c5a3f5
++224c65e4a5c6ede076c364c93933cedd17f1e70b

diff --cc src/os_win.c
index 78dd4ab0ca2acd817737caee527e0e5d1674ff7e,fcfe0118ed4e95424c4e8c19ecfb965390c08e4b..4652304c4f0931cdbe943dc5a035f6981739cf08
--- 1/src/os_win.c
--- 2/src/os_win.c
+++ b/src/os_win.c
@@@ -682,116 -611,7 +682,116 @@@ static struct win_syscall 
    { "WriteFile",               (SYSCALL)WriteFile,               0 },
  
  #define osWriteFile ((BOOL(WINAPI*)(HANDLE,LPCVOID,DWORD,LPDWORD, \
 -        LPOVERLAPPED))aSyscall[59].pCurrent)
 +        LPOVERLAPPED))aSyscall[58].pCurrent)
 +
- #if !SQLITE_OS_WINCE
++#if SQLITE_OS_WINRT
 +  { "CreateEventExW",          (SYSCALL)CreateEventExW,          0 },
 +#else
 +  { "CreateEventExW",          (SYSCALL)0,                       0 },
 +#endif
 +
 +#define osCreateEventExW ((HANDLE(WINAPI*)(LPSECURITY_ATTRIBUTES,LPCWSTR, \
 +        DWORD,DWORD))aSyscall[59].pCurrent)
 +
 +#if !SQLITE_OS_WINRT
 +  { "WaitForSingleObject",     (SYSCALL)WaitForSingleObject,     0 },
 +#else
 +  { "WaitForSingleObject",     (SYSCALL)0,                       0 },
 +#endif
 +
 +#define osWaitForSingleObject ((DWORD(WINAPI*)(HANDLE, \
 +        DWORD))aSyscall[60].pCurrent)
 +
 +#if !SQLITE_OS_WINCE
 +  { "WaitForSingleObjectEx",   (SYSCALL)WaitForSingleObjectEx,   0 },
 +#else
 +  { "WaitForSingleObjectEx",   (SYSCALL)0,                       0 },
 +#endif
 +
 +#define osWaitForSingleObjectEx ((DWORD(WINAPI*)(HANDLE,DWORD, \
 +        BOOL))aSyscall[61].pCurrent)
 +
 +#if !SQLITE_OS_WINCE
 +  { "SetFilePointerEx",        (SYSCALL)SetFilePointerEx,        0 },
 +#else
 +  { "SetFilePointerEx",        (SYSCALL)0,                       0 },
 +#endif
 +
 +#define osSetFilePointerEx ((BOOL(WINAPI*)(HANDLE,LARGE_INTEGER, \
 +        PLARGE_INTEGER,DWORD))aSyscall[62].pCurrent)
 +
- #if !SQLITE_OS_WINCE
++#if SQLITE_OS_WINRT
 +  { "GetFileInformationByHandleEx", (SYSCALL)GetFileInformationByHandleEx, 0 },
 +#else
 +  { "GetFileInformationByHandleEx", (SYSCALL)0,                  0 },
 +#endif
 +
 +#define osGetFileInformationByHandleEx ((BOOL(WINAPI*)(HANDLE, \
 +        FILE_INFO_BY_HANDLE_CLASS,LPVOID,DWORD))aSyscall[63].pCurrent)
 +
 +#if !SQLITE_OS_WINCE
 +  { "MapViewOfFileEx",         (SYSCALL)MapViewOfFileEx,         0 },
 +#else
 +  { "MapViewOfFileEx",         (SYSCALL)0,                       0 },
 +#endif
 +
 +#define osMapViewOfFileEx ((LPVOID(WINAPI*)(HANDLE,DWORD,DWORD,DWORD,SIZE_T, \
 +        LPVOID))aSyscall[64].pCurrent)
 +
 +#if SQLITE_OS_WINRT
 +  { "CreateFile2",             (SYSCALL)CreateFile2,             0 },
 +#else
 +  { "CreateFile2",             (SYSCALL)0,                       0 },
 +#endif
 +
 +#define osCreateFile2 ((HANDLE(WINAPI*)(LPCWSTR,DWORD,DWORD,DWORD, \
 +        LPCREATEFILE2_EXTENDED_PARAMETERS))aSyscall[65].pCurrent)
 +
 +#if SQLITE_OS_WINRT
 +  { "LoadPackagedLibrary",     (SYSCALL)LoadPackagedLibrary,     0 },
 +#else
 +  { "LoadPackagedLibrary",     (SYSCALL)0,                       0 },
 +#endif
 +
 +#define osLoadPackagedLibrary ((HMODULE(WINAPI*)(LPCWSTR, \
 +        DWORD))aSyscall[66].pCurrent)
 +
 +#if SQLITE_OS_WINRT
 +  { "GetTickCount64",          (SYSCALL)GetTickCount64,          0 },
 +#else
 +  { "GetTickCount64",          (SYSCALL)0,                       0 },
 +#endif
 +
 +#define osGetTickCount64 ((ULONGLONG(WINAPI*)(VOID))aSyscall[67].pCurrent)
 +
 +#if SQLITE_OS_WINRT
 +  { "GetNativeSystemInfo",     (SYSCALL)GetNativeSystemInfo,     0 },
 +#else
 +  { "GetNativeSystemInfo",     (SYSCALL)0,                       0 },
 +#endif
 +
 +#define osGetNativeSystemInfo ((VOID(WINAPI*)( \
 +        LPSYSTEM_INFO))aSyscall[68].pCurrent)
 +
 +#if defined(SQLITE_WIN32_HAS_ANSI)
 +  { "OutputDebugStringA",      (SYSCALL)OutputDebugStringA,      0 },
 +#else
 +  { "OutputDebugStringA",      (SYSCALL)0,                       0 },
 +#endif
 +
 +#define osOutputDebugStringA ((VOID(WINAPI*)(LPCSTR))aSyscall[69].pCurrent)
 +
 +#if defined(SQLITE_WIN32_HAS_WIDE)
 +  { "OutputDebugStringW",      (SYSCALL)OutputDebugStringW,      0 },
 +#else
 +  { "OutputDebugStringW",      (SYSCALL)0,                       0 },
 +#endif
 +
 +#define osOutputDebugStringW ((VOID(WINAPI*)(LPCWSTR))aSyscall[70].pCurrent)
 +
 +  { "GetProcessHeap",          (SYSCALL)GetProcessHeap,          0 },
 +
 +#define osGetProcessHeap ((HANDLE(WINAPI*)(VOID))aSyscall[71].pCurrent)
  
  }; /* End of the overrideable system calls */
  

diff --cc src/sqlite.h.in
Simple merge

diff --cc test/pager1.test
Simple merge

diff --cc test/tester.tcl
Simple merge

diff --cc test/wal.test
Simple merge