Merge the latest trunk changes into the sessions branch. This merge

should fix the build for WinRT.

FossilOrigin-Name: e111e4edf9d7b2d4d6d6673a7576801839e9537d

diff --cc Makefile.in
Simple merge

diff --cc Makefile.msc
index 88f9fc95ee9c53d2d0598e78322d64029ef8e110,b9aeea334b8b02f226a6ca33124e6cdac05f43dc..4a43cd4108ce64d72c2a96827be212a0f878cff9
--- 1/Makefile.msc
--- 2/Makefile.msc
+++ b/Makefile.msc
@@@ -1278,7 -1293,7 +1316,7 @@@ TESTFIXTURE_FLAGS = -DTCLSH=1 -DSQLITE_
  TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_SERVER=1 -DSQLITE_PRIVATE="" -DSQLITE_CORE
  
  TESTFIXTURE_SRC0 = $(TESTEXT) $(TESTSRC2) libsqlite3.lib
- TESTFIXTURE_SRC1 = $(TESTEXT) $(TESTSRC3) sqlite3.c
 -TESTFIXTURE_SRC1 = $(TESTEXT) $(SQLITE3C)
++TESTFIXTURE_SRC1 = $(TESTEXT) $(TESTSRC3) $(SQLITE3C)
  !IF $(USE_AMALGAMATION)==0
  TESTFIXTURE_SRC = $(TESTSRC) $(TOP)\src\tclsqlite.c $(TESTFIXTURE_SRC0)
  !ELSE

diff --cc main.mk
Simple merge

diff --cc manifest
index b8931786bfe49d37f9b18722e183859034bd11ce,506d3c8ea6d8e45434f7cd091d359567705f8477..cb2f963abe3e49e093bf1df64b5b252560a706f1
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Synchronize\swith\sthe\strunk.
- D 2013-10-10T20:13:18.129
 -C Fix\sharmless\smacro\sredefinition\swarnings\sin\sthe\stotype\sextension.
 -D 2013-10-15T11:58:34.089
++C Merge\sthe\slatest\strunk\schanges\sinto\sthe\ssessions\sbranch.\s\sThis\smerge\nshould\sfix\sthe\sbuild\sfor\sWinRT.
++D 2013-10-15T14:10:44.320
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in aff38bc64c582dd147f18739532198372587b0f0
 -F Makefile.in 0522b53cdc1fcfc18f3a98e0246add129136c654
++F Makefile.in 15f75d6d804c5552a05390d1982c1114b8ce6d2d
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc 0796df82bd075b80794ed7a56d497a447688c87f
 -F Makefile.msc ec5d662ed5a15ff819928c0495017af13910d7b6
++F Makefile.msc 72a3e9091272201b337908e136de753ba38c8206
  F Makefile.vxworks db21ed42a01d5740e656b16f92cb5d8d5e5dd315
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
  F VERSION a8d1f6839521130dc73c5408cdd24bcfd791df34
@@@ -137,24 -138,10 +138,24 @@@ F ext/rtree/rtree_util.tcl 06aab2ed5b82
  F ext/rtree/sqlite3rtree.h c34c1e41d1ab80bb8ad09aae402c9c956871a765
  F ext/rtree/tkt3363.test 142ab96eded44a3615ec79fba98c7bde7d0f96de
  F ext/rtree/viewrtree.tcl eea6224b3553599ae665b239bd827e182b466024
 +F ext/session/session1.test 894e3bc9f497c4fa07a2aa3271e3911f3670c3d8
 +F ext/session/session2.test 99ca0da7ddb617d42bafd83adccf99f18ae0384b
 +F ext/session/session3.test a7a9ce59b8d1e49e2cc23d81421ac485be0eea01
 +F ext/session/session4.test a6ed685da7a5293c5d6f99855bcf41dbc352ca84
 +F ext/session/session5.test 8fdfaf9dba28a2f1c6b89b06168bdab1fef2d478
 +F ext/session/session6.test 443789bc2fca12e4f7075cf692c60b8a2bea1a26
 +F ext/session/session8.test 7d35947ad329b8966f095d34f9617a9eff52dc65
 +F ext/session/session9.test 43acfdc57647c2ce4b36dbd0769112520ea6af14
 +F ext/session/sessionA.test eb05c13e4ef1ca8046a3a6dbf2d5f6f5b04a11d4
 +F ext/session/session_common.tcl 1539d8973b2aea0025c133eb0cc4c89fcef541a5
 +F ext/session/sessionfault.test 496291b287ba3c0b14ca2e074425e29cc92a64a6
 +F ext/session/sqlite3session.c 63eea3741e8ac1574d4c183fd92a6a50b1415357
 +F ext/session/sqlite3session.h 6c35057241567ed6319f750ee504a81c459225e1
 +F ext/session/test_session.c d38968307c05229cc8cd603722cf305d6f768832
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
- F magic.txt f2b23a6bde8f1c6e86b957e4d94eab0add520b0d
- F main.mk ef33a733d386a4ea72e522f1a6f9c50665852d22
+ F magic.txt 814d3de5ec227817ff2ad26cbc73159c968a2a58
 -F main.mk c6a433cb334bbb019625c137ab5d5e7568b47cff
++F main.mk f572e71022e342deb3a4786a728eb20765e0cfae
  F mkdll.sh 7d09b23c05d56532e9d44a50868eb4b12ff4f74a
  F mkextu.sh 416f9b7089d80e5590a29692c9d9280a10dbad9f
  F mkextw.sh d2a981497b404d6498f5ff3e3b1f3816bdfcb338
@@@ -185,11 -172,11 +186,11 @@@ F src/build.c 8ae900bf021a66ac110f5eb2d
  F src/callback.c f99a8957ba2adf369645fac0db09ad8adcf1caa2
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
  F src/ctime.c ea4b7f3623a0fcb1146e7f245d7410033e86859c
- F src/date.c 65196e95e69f36993659bd7781abe7c2f1994739
+ F src/date.c 593c744b2623971e45affd0bde347631bdfa4625
 -F src/delete.c 45788c5e48734f2af4acd75a876466e5b9838e34
 +F src/delete.c 92d409e4c3ab3c5f1173451971a40226ce4cfe1c
  F src/expr.c e7338ccffdc391c53ba2d51c5eb6a2f5299e040e
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
- F src/fkey.c be866cd8c4fa6cae98ba33109578fd1a3311ee5b
+ F src/fkey.c 5dc10cbaa355753903cd2a64da040f948997ebf8
  F src/func.c 2c47b65e6e00e3e9374942f28254faf8adafe398
  F src/global.c 5caf4deab621abb45b4c607aad1bd21c20aac759
  F src/hash.c ac3470bbf1ca4ae4e306a8ecb0fdf1731810ffe4
@@@ -229,19 -216,19 +230,19 @@@ F src/pragma.c 64d3d1f8b4ed144ba85c061d
  F src/prepare.c fa6988589f39af8504a61731614cd4f6ae71554f
  F src/printf.c da9119eb31a187a4b99f60aa4a225141c0ebb74b
  F src/random.c 0b2dbc37fdfbfa6bd455b091dfcef5bdb32dba68
- F src/resolve.c 7459801d02997b07e8b8da85ef255392ba1d022b
+ F src/resolve.c 5f15b00644c36a1610b87857abf42db38c07519c
  F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
  F src/select.c 15127b54cc11defb2cddef6914e1f384501a61c4
- F src/shell.c 5ee50ca3e35453bbd6ccdf1bdd0f6bbe9738e9fb
- F src/sqlite.h.in d8c9a296c52e115e07eeea9360a43949e2c842fe
+ F src/shell.c 6f11f0e9ded63d48e306f2c6858c521e568a47bb
 -F src/sqlite.h.in 4c6eb96fded1d56a27cec04b6b6803789eb28f54
++F src/sqlite.h.in 29199f78f9eba5f935c62dc79a3eb64f26b5e433
  F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
  F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
- F src/sqliteInt.h 8605554b15c054b5b7b1d8129207d2b5cd87cfa5
 -F src/sqliteInt.h 4dd81a25a919509ce94b1f8f120bbef14458d4b9
++F src/sqliteInt.h cc58deabef26a4a82e7b40c47316968e359c6fae
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
 -F src/tclsqlite.c 3b5f3716e320480659239abe887164521c575d83
 +F src/tclsqlite.c c63a05eff963c3c8d412441301df8246372d072f
- F src/test1.c 26226cfd2b6dc3f77d2eb27f07ffcf236b4e728b
+ F src/test1.c 5757066e503a8ed51313cb3a5d9bcdcced2991a9
  F src/test2.c 7355101c085304b90024f2261e056cdff13c6c35
  F src/test3.c 1c0e5d6f080b8e33c1ce8b3078e7013fdbcd560c
  F src/test4.c 9b32d22f5f150abe23c1830e2057c4037c45b3df
@@@ -292,13 -279,13 +293,13 @@@ F src/update.c be9831a714638ed5b66e2154
  F src/utf.c 6fc6c88d50448c469c5c196acf21617a24f90269
  F src/util.c 2fa6c821d28bbdbeec1b2a7b091a281c9ef8f918
  F src/vacuum.c f313bc97123a4dd4bfd3f50a00c4d44c08a5b1b7
 -F src/vdbe.c 56e648f5ba9a91810caf216857adfed9039cd174
 -F src/vdbe.h 4f554b5627f26710c4c36d919110a3fc611ca5c4
 -F src/vdbeInt.h ff57f67aee1ba26a3a47e786533dab155ab6dad6
 -F src/vdbeapi.c 93a22a9ba2abe292d5c2cf304d7eb2e894dde0ed
 -F src/vdbeaux.c 55f4858fe6abd84bd7311acbf30a75a28903ec25
 -F src/vdbeblob.c 5dc79627775bd9a9b494dd956e26297946417d69
 +F src/vdbe.c bc9924611f5cc16ac770bb9a37365c57899edafa
 +F src/vdbe.h 7aa3ab6210a68471c8490dedfc9aa4ef5684b9a0
 +F src/vdbeInt.h 2eaf8a38ec76738bbb18429e6c4f317e3766742e
 +F src/vdbeapi.c 8ade912f7023a3b35ee64497a94718ddbd7269c3
 +F src/vdbeaux.c 371a22e7485e57048be1e625eb0b82e3429b0f58
 +F src/vdbeblob.c 1268e0bcb8e21fa32520b0fc376e1bcdfaa0c642
- F src/vdbemem.c 817ce21ab4ca57f902619bb8fef3f8a51bbd0ed8
+ F src/vdbemem.c 649933bad3e922465b726eaf85c72a75acba2ab7
  F src/vdbesort.c 3937e06b2a0e354500e17dc206ef4c35770a5017
  F src/vdbetrace.c e7ec40e1999ff3c6414424365d5941178966dcbc
  F src/vtab.c 5a423b042eb1402ef77697d03d6a67378d97bc8d
@@@ -476,8 -463,8 +477,8 @@@ F test/fkey1.test e1d1fa84cde579185ea01
  F test/fkey2.test 06e0b4cc9e1b3271ae2ae6feeb19755468432111
  F test/fkey3.test 5ec899d12b13bcf1e9ef40eff7fb692fdb91392e
  F test/fkey4.test 86446017011273aad8f9a99c1a65019e7bd9ca9d
- F test/fkey5.test 0bf64f2d19ad80433ca0b24edbf604a18b353d5f
- F test/fkey6.test 2d76497c54db0e5bfbecee0acf00bb8a706b37db
+ F test/fkey5.test 8a1fde4e7721ae00b05b3178888833726ca2df8d
 -F test/fkey6.test 18e8c024d39f68f8d4bb1177c992bcffdc273464
++F test/fkey6.test cd81be336e0664c7e4d3523efb67171d720192ef
  F test/fkey7.test e31d0e71a41c1d29349a16448d6c420e2c53a8fc
  F test/fkey_malloc.test bb74c9cb8f8fceed03b58f8a7ef2df98520bbd51
  F test/format4.test 1f0cac8ff3895e9359ed87e41aaabee982a812eb
@@@ -738,9 -726,9 +740,9 @@@ F test/pagesize.test 1dd51367e752e742f5
  F test/pcache.test b09104b03160aca0d968d99e8cd2c5b1921a993d
  F test/pcache2.test a83efe2dec0d392f814bfc998def1d1833942025
  F test/percentile.test b98fc868d71eb5619d42a1702e9ab91718cbed54
 -F test/permutations.test e154f5ed66d4d4913a99a110e870c9407f75b055
 +F test/permutations.test 08dbc6b0f4afbdffd701346ffae2998bb612c335
- F test/pragma.test 5c6e8ae9eaa9a505cc1035b51f7f0da9805092c7
- F test/pragma2.test 224f0381f9411a78ae685cac24c13656a62021b7
+ F test/pragma.test 5e7de6c32a5d764f09437d2025f07e4917b9e178
+ F test/pragma2.test aea7b3d82c76034a2df2b38a13745172ddc0bc13
  F test/printf.test ec9870c4dce8686a37818e0bf1aba6e6a1863552
  F test/progress.test a282973d1d17f08071bc58a77d6b80f2a81c354d
  F test/ptrchng.test ef1aa72d6cf35a2bbd0869a649b744e9d84977fc
@@@ -1105,13 -1092,13 +1107,13 @@@ F tool/logest.c 7ad625cac3d54012b27d468
  F tool/mkautoconfamal.sh f8d8dbf7d62f409ebed5134998bf5b51d7266383
  F tool/mkkeywordhash.c bb52064aa614e1426445e4b2b9b00eeecd23cc79
  F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e
- F tool/mkpragmatab.tcl ceaaeebcd882864caefe4176592ca6fa4648fab1
+ F tool/mkpragmatab.tcl 3fc52e00a234750675e8a569d2919ff48558e9eb
  F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
  F tool/mksqlite3c-noext.tcl 8bce31074e4cbe631bb7676526a048335f4c9f02
- F tool/mksqlite3c.tcl 72e4608a3b53994b11cf2d2a6fcd7d868543cd13
 -F tool/mksqlite3c.tcl d8dc444d403019167260e5578f5c362741f03696
 -F tool/mksqlite3h.tcl ba24038056f51fde07c0079c41885ab85e2cff12
++F tool/mksqlite3c.tcl cfc3838294137f89be9abe05fcc967524f1a2618
 +F tool/mksqlite3h.tcl 2d0f1b3768f8d000b7881217d5fd4c776eb27467
  F tool/mksqlite3internalh.tcl 3dca7bb5374cee003379b8cbac73714f610ef795
- F tool/mkvsix.tcl f3312df26fd9938a27fa0a845ec96bea84b0c16b
+ F tool/mkvsix.tcl 6477fb9dab838b7eea1eed50658ff1cda04850b5
  F tool/offsets.c fe4262fdfa378e8f5499a42136d17bf3b98f6091
  F tool/omittest.tcl 4665982e95a6e5c1bd806cf7bc3dea95be422d77
  F tool/opcodeDoc.awk b3a2a3d5d3075b8bd90b7afe24283efdd586659c
@@@ -1136,9 -1123,10 +1138,9 @@@ F tool/symbols.sh c5a617b8c61a0926747a5
  F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
  F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
- F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
+ F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
  F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
- P cdd3838b7876639cf99904b2054884247fbff529 fc5552da0d3c41aea58292d267c247f9ca8ed474
- R ed045d2f64c97650097a00687a5a6562
 -P 73238f655a58c810876f46cc04eab1ac2d5b8ef7 a38adeb7ffd77474754b66877d60717cdb3cb865
 -R 0fe1cba58471de6f4ef89edb477677c8
 -T +closed a38adeb7ffd77474754b66877d60717cdb3cb865
++P 136445ba020c9475d3f5a7843d7d0add98477138 c9c1f8d6701b0a1bc939a7e35e565d4160dbf8d3
++R 848ed2600ebe9a1cfea2c2b375b8cc21
  U drh
- Z 4fa40793a65e72ae16d2bb15a973a4b7
 -Z b0e8951483d507d3c988ee6a91bfa255
++Z b89bea4f98dc4e576150aa4c3d9abc52

diff --cc manifest.uuid
index 2841529b1ef1d5f90b8f6e0725ff3966fd35b0fa,558845bd83d67d18b5ce483b923892abf813571d..b5ba2981372d56f058552f7addbd73c83cebde21
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 136445ba020c9475d3f5a7843d7d0add98477138
 -c9c1f8d6701b0a1bc939a7e35e565d4160dbf8d3
++e111e4edf9d7b2d4d6d6673a7576801839e9537d

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

diff --cc src/sqliteInt.h
Simple merge

diff --cc test/fkey6.test
Simple merge

diff --cc tool/mksqlite3c.tcl
index dd5748200739a0a51945896aa8018e3f32615802,3f42da549dcb3d9cade6322b6503ce5f9cd3d954..9e796e376656600913cefec5d0f33a1fdc1ad897
--- 1/tool/mksqlite3c.tcl
--- 2/tool/mksqlite3c.tcl
+++ b/tool/mksqlite3c.tcl
@@@ -121,7 -120,7 +121,8 @@@ foreach hdr 
    set available_hdr($hdr) 1
  }
  set available_hdr(sqliteInt.h) 0
 +set available_hdr(sqlite3session.h) 0
+ set available_hdr(sqlite3.h) 0
  
  # 78 stars used for comment formatting.
  set s78 \