Synchronize with the trunk.

FossilOrigin-Name: 136445ba020c9475d3f5a7843d7d0add98477138

diff --cc Makefile.msc
Simple merge

diff --cc main.mk
Simple merge

diff --cc manifest
index eb2854b5611e09ce24e36e01ca0ef288b30e9a19,81b99da581d271bd5337328ab7b7cb0e03f2bf31..b8931786bfe49d37f9b18722e183859034bd11ce
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\sin\sall\sthe\slatest\strunk\schanges,\sincluding\sthe\swin32-longpath\sVFS\sand\nthe\sfix\sfor\sthe\ssegfault\sin\sthe\somit-left-join\soptimization.
- D 2013-09-03T14:49:07.725
 -C Add\sa\srule\sto\sthe\smain.mk\smakefile\sfor\sbuilding\sshowdb.
 -D 2013-10-10T17:33:52.465
++C Synchronize\swith\sthe\strunk.
++D 2013-10-10T20:13:18.129
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
 +F Makefile.in aff38bc64c582dd147f18739532198372587b0f0
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc a3ad9cc70b639cb8d2fe42d24b5c6c127aaac346
 -F Makefile.msc 9af063716f726a73b5d5c98c69ea97eca6a9369b
++F Makefile.msc 0796df82bd075b80794ed7a56d497a447688c87f
  F Makefile.vxworks db21ed42a01d5740e656b16f92cb5d8d5e5dd315
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
  F VERSION a8d1f6839521130dc73c5408cdd24bcfd791df34
@@@ -153,7 -140,7 +154,7 @@@ F ext/session/test_session.c d38968307c
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt f2b23a6bde8f1c6e86b957e4d94eab0add520b0d
- F main.mk 332db7908f776f4f31da6f83228b0703673eb394
 -F main.mk 0c63aec9b9ecf66aaa8c09a02fcd74cf76e89ac8
++F main.mk ef33a733d386a4ea72e522f1a6f9c50665852d22
  F mkdll.sh 7d09b23c05d56532e9d44a50868eb4b12ff4f74a
  F mkextu.sh 416f9b7089d80e5590a29692c9d9280a10dbad9f
  F mkextw.sh d2a981497b404d6498f5ff3e3b1f3816bdfcb338
@@@ -177,30 -164,30 +178,30 @@@ F src/auth.c 523da7fb4979469955d822ff92
  F src/backup.c 2f1987981139bd2f6d8c728d64bf09fb387443c3
  F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
  F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
- F src/btree.c b9b57df546df2636294bfb21a986f5707b417df2
+ F src/btree.c d5720cbb21ae56e7e5b07847e05e5b203818acac
  F src/btree.h bfe0e8c5759b4ec77b0d18390064a6ef3cdffaaf
- F src/btreeInt.h 51cf220a9b9223354770883e93a859dc377aa27f
- F src/build.c f63e8929c7f89c0074fbc74929bc946ea117b2f8
- F src/callback.c d7e46f40c3cf53c43550b7da7a1d0479910b62cc
+ F src/btreeInt.h f038e818bfadf75afbd09819ed93c26a333d39e0
+ F src/build.c 3da02c07b0f198a11ce3766cd34eac311656f1e8
+ F src/callback.c f99a8957ba2adf369645fac0db09ad8adcf1caa2
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
  F src/ctime.c ea4b7f3623a0fcb1146e7f245d7410033e86859c
- F src/date.c 067a81c9942c497aafd2c260e13add8a7d0c7dd4
- F src/delete.c 30ed4bc76a1a32c55bf17ac1528c5867aa5502c0
- F src/expr.c 4d89bd03a04fcdb5ff71d86b4e0cc7d3230797b8
+ F src/date.c 65196e95e69f36993659bd7781abe7c2f1994739
 -F src/delete.c 45788c5e48734f2af4acd75a876466e5b9838e34
++F src/delete.c 92d409e4c3ab3c5f1173451971a40226ce4cfe1c
+ F src/expr.c e7338ccffdc391c53ba2d51c5eb6a2f5299e040e
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
- F src/fkey.c 914a6bbd987d857c41ac9d244efa6641f36faadb
- F src/func.c 5b064acd303b3e74f019ab551d423ff6cace4023
+ F src/fkey.c be866cd8c4fa6cae98ba33109578fd1a3311ee5b
+ F src/func.c 2c47b65e6e00e3e9374942f28254faf8adafe398
  F src/global.c 5caf4deab621abb45b4c607aad1bd21c20aac759
  F src/hash.c ac3470bbf1ca4ae4e306a8ecb0fdf1731810ffe4
  F src/hash.h 8890a25af81fb85a9ad7790d32eedab4b994da22
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
- F src/insert.c 54ec6fd4d3d08438f4d9a6b87ca422de94501d37
 -F src/insert.c 9a3f578ffe37f18ef695a06764320db5dc1f0011
++F src/insert.c feaa30b45af7f6a6bf363cc0ac05c1c25d162eff
  F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
  F src/legacy.c 0df0b1550b9cc1f58229644735e317ac89131f12
  F src/lempar.c cdf0a000315332fc9b50b62f3b5e22e080a0952b
  F src/loadext.c 867c7b330b740c6c917af9956b13b81d0a048303
- F src/main.c 97cc7970a6010e9c7a3cc96d2845b6be947909b6
- F src/malloc.c fe085aa851b666b7c375c1ff957643dc20a04bf6
 -F src/main.c 35931467ec026b05babb279cb8a573e62f6fe1a3
++F src/main.c 0cc0574e656567999115fe93666a3f97ad917e86
+ F src/malloc.c 543a8eb5508eaf4cadf55a9b503379eba2088128
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 437c7c4af964895d4650f29881df63535caaa1fa
  F src/mem2.c dce31758da87ec2cfa52ba4c5df1aed6e07d8e8f
@@@ -228,18 -215,18 +229,18 @@@ F src/pragma.c f4ff6e29c316d06bf7dffca0
  F src/prepare.c fa6988589f39af8504a61731614cd4f6ae71554f
  F src/printf.c da9119eb31a187a4b99f60aa4a225141c0ebb74b
  F src/random.c 0b2dbc37fdfbfa6bd455b091dfcef5bdb32dba68
- F src/resolve.c 9d53899cc6e1f4ec0b4632d07e97d57827bf63b9
+ F src/resolve.c 7459801d02997b07e8b8da85ef255392ba1d022b
  F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
- F src/select.c 8b148eb851f384412aea57091659d14b369918ca
- F src/shell.c dbe064d404bb497acd8a44c066cd6b8460a71236
+ F src/select.c 15127b54cc11defb2cddef6914e1f384501a61c4
+ F src/shell.c 5ee50ca3e35453bbd6ccdf1bdd0f6bbe9738e9fb
 -F src/sqlite.h.in ec40aa958a270416fb04b4f72210357bf163d2c5
 +F src/sqlite.h.in d8c9a296c52e115e07eeea9360a43949e2c842fe
- F src/sqlite3.rc fea433eb0a59f4c9393c8e6d76a6e2596b1fe0c0
+ F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
  F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
- F src/sqliteInt.h 7806162e2d9796e9d9b6025f0757904b605ff91c
 -F src/sqliteInt.h 5dbfc960fb39dbb55ba16697f453b03cd759b04a
++F src/sqliteInt.h 8605554b15c054b5b7b1d8129207d2b5cd87cfa5
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
- F src/tclsqlite.c a25933b085bde305a59b43e52f5624871db46a1e
 -F src/tclsqlite.c 3b5f3716e320480659239abe887164521c575d83
++F src/tclsqlite.c c63a05eff963c3c8d412441301df8246372d072f
  F src/test1.c 26226cfd2b6dc3f77d2eb27f07ffcf236b4e728b
  F src/test2.c 7355101c085304b90024f2261e056cdff13c6c35
  F src/test3.c 1c0e5d6f080b8e33c1ce8b3078e7013fdbcd560c
@@@ -286,25 -273,25 +287,25 @@@ F src/test_vfs.c e72f555ef7a59080f898fc
  F src/test_vfstrace.c 34b544e80ba7fb77be15395a609c669df2e660a2
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/tokenize.c 70061085a51f2f4fc15ece94f32c03bcb78e63b2
- F src/trigger.c 5c0ea9b8755e7c5e1a700f3e27ac4f8d92dd221e
- F src/update.c 8bacc585ae5d6a85b0944934bed5d445f4a872ef
+ F src/trigger.c ba0a883cd536b7dfdd4df3733001f5372a4299da
 -F src/update.c f5182157f5d0d0a97bc5f5e3c9bdba0dfbe08f08
++F src/update.c be9831a714638ed5b66e215451d4775d136ea745
  F src/utf.c 6fc6c88d50448c469c5c196acf21617a24f90269
- F src/util.c f566b5138099a2df8533b190d0dcc74b7dfbe0c9
- F src/vacuum.c d9c5759f4c5a438bb43c2086f72c5d2edabc36c8
- F src/vdbe.c 8ebe0cbc71f99b7a6fc6c49d92b555d0b96f3717
+ 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 9bf236dc477fb8f1f54b078cf80064663f8a409a
- F src/vdbeapi.c ae87d198eb3ce67c02886601baee0fd478092076
- F src/vdbeaux.c 20ec92cdc43374b6537fbd7bc2cf7a28967bbe44
++F src/vdbeInt.h 2eaf8a38ec76738bbb18429e6c4f317e3766742e
++F src/vdbeapi.c 8ade912f7023a3b35ee64497a94718ddbd7269c3
++F src/vdbeaux.c 371a22e7485e57048be1e625eb0b82e3429b0f58
 +F src/vdbeblob.c 1268e0bcb8e21fa32520b0fc376e1bcdfaa0c642
- F src/vdbemem.c 75ad7fd8f068a8baaba1cf3a84714ef7d3b7a2b8
+ F src/vdbemem.c 817ce21ab4ca57f902619bb8fef3f8a51bbd0ed8
  F src/vdbesort.c 3937e06b2a0e354500e17dc206ef4c35770a5017
  F src/vdbetrace.c e7ec40e1999ff3c6414424365d5941178966dcbc
- F src/vtab.c 165ce0e797c2cd23badb104c9f2ae9042d6d942c
+ F src/vtab.c 5a423b042eb1402ef77697d03d6a67378d97bc8d
  F src/wal.c 7dc3966ef98b74422267e7e6e46e07ff6c6eb1b4
  F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
- F src/walker.c 4fa43583d0a84b48f93b1e88f11adf2065be4e73
- F src/where.c 99477e9dd4d4d33be32115b4fbd18b6f033d045a
+ F src/walker.c e9e593d5bb798c3e67fc3893dfe7055c9e7d8d74
+ F src/where.c 8dd4cb208b9b70beeb9da7dbcd9b8b8b08261ed7
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
  F test/aggnested.test 45c0201e28045ad38a530b5a144b73cd4aa2cfd6
@@@ -474,7 -463,8 +477,8 @@@ F test/fkey2.test 06e0b4cc9e1b3271ae2ae
  F test/fkey3.test 5ec899d12b13bcf1e9ef40eff7fb692fdb91392e
  F test/fkey4.test 86446017011273aad8f9a99c1a65019e7bd9ca9d
  F test/fkey5.test 0bf64f2d19ad80433ca0b24edbf604a18b353d5f
 -F test/fkey6.test c555f7fc45d842cc84b0d3ff93951ce2b8c25fc8
 +F test/fkey6.test 2d76497c54db0e5bfbecee0acf00bb8a706b37db
+ F test/fkey7.test e31d0e71a41c1d29349a16448d6c420e2c53a8fc
  F test/fkey_malloc.test bb74c9cb8f8fceed03b58f8a7ef2df98520bbd51
  F test/format4.test 1f0cac8ff3895e9359ed87e41aaabee982a812eb
  F test/fts-9fd058691.test 78b887e30ae6816df0e1fed6259de4b5a64ad33c
@@@ -584,7 -577,8 +591,8 @@@ F test/fuzz_common.tcl a87dfbb88c2a6b08
  F test/fuzz_malloc.test 328f70aaca63adf29b4c6f06505ed0cf57ca7c26
  F test/fuzzer1.test d4c52aaf3ef923da293a2653cfab33d02f718a36
  F test/fuzzerfault.test 8792cd77fd5bce765b05d0c8e01b9edcf8af8536
 -F test/hook.test 45cb22b940c3cc0af616ba7430f666e245711a48
+ F test/genesis.tcl 1e2e2e8e5cc4058549a154ff1892fe5c9de19f98
 +F test/hook.test 777b2541f6dd4f4ca5e8d6b66c1df1b3717aeab6
  F test/icu.test 70df4faca133254c042d02ae342c0a141f2663f4
  F test/in.test 5941096407d8c133b9eff15bd3e666624b6cbde3
  F test/in2.test 5d4c61d17493c832f7d2d32bef785119e87bde75
@@@ -730,8 -724,8 +738,8 @@@ F test/pagesize.test 1dd51367e752e742f5
  F test/pcache.test b09104b03160aca0d968d99e8cd2c5b1921a993d
  F test/pcache2.test a83efe2dec0d392f814bfc998def1d1833942025
  F test/percentile.test b98fc868d71eb5619d42a1702e9ab91718cbed54
- F test/permutations.test e47491436e9fc8647535ab92602e01f3012a5b9d
- F test/pragma.test 5e7de6c32a5d764f09437d2025f07e4917b9e178
 -F test/permutations.test e154f5ed66d4d4913a99a110e870c9407f75b055
++F test/permutations.test 08dbc6b0f4afbdffd701346ffae2998bb612c335
+ F test/pragma.test 5c6e8ae9eaa9a505cc1035b51f7f0da9805092c7
  F test/pragma2.test 224f0381f9411a78ae685cac24c13656a62021b7
  F test/printf.test ec9870c4dce8686a37818e0bf1aba6e6a1863552
  F test/progress.test a282973d1d17f08071bc58a77d6b80f2a81c354d
@@@ -783,10 -777,9 +791,10 @@@ F test/selectC.test 871fb55d884d3de5943
  F test/selectD.test b0f02a04ef7737decb24e08be2c39b9664b43394
  F test/selectE.test fc02a1eb04c8eb537091482644b7d778ae8759b7
  F test/server1.test 46803bd3fe8b99b30dbc5ff38ffc756f5c13a118
 +F test/session.test 082dea459efc76e2a527b8ee9ff74d76e63ea7b6
  F test/shared.test 1da9dbad400cee0d93f252ccf76e1ae007a63746
  F test/shared2.test 03eb4a8d372e290107d34b6ce1809919a698e879
- F test/shared3.test ebf77f023f4bdaa8f74f65822b559e86ce5c6257
+ F test/shared3.test fcd65cb11d189eff5f5c85cc4fad246fb0933108
  F test/shared4.test 72d90821e8d2fc918a08f16d32880868d8ee8e9d
  F test/shared6.test 866bb4982c45ce216c61ded5e8fde4e7e2f3ffa9
  F test/shared7.test 960760bc8d03e1419e70dea69cf41db62853616e
@@@ -1092,12 -1090,13 +1105,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/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
  F tool/mksqlite3c-noext.tcl 8bce31074e4cbe631bb7676526a048335f4c9f02
 -F tool/mksqlite3c.tcl d344cc3144a0271cd853c5e3df36e9f31d78d619
 -F tool/mksqlite3h.tcl ba24038056f51fde07c0079c41885ab85e2cff12
 +F tool/mksqlite3c.tcl 72e4608a3b53994b11cf2d2a6fcd7d868543cd13
 +F tool/mksqlite3h.tcl 2d0f1b3768f8d000b7881217d5fd4c776eb27467
  F tool/mksqlite3internalh.tcl 3dca7bb5374cee003379b8cbac73714f610ef795
- F tool/mkvsix.tcl 0be7f7a591f1e83f9199cb82911b66668ca484c9
+ F tool/mkvsix.tcl f3312df26fd9938a27fa0a845ec96bea84b0c16b
  F tool/offsets.c fe4262fdfa378e8f5499a42136d17bf3b98f6091
  F tool/omittest.tcl 4665982e95a6e5c1bd806cf7bc3dea95be422d77
  F tool/opcodeDoc.awk b3a2a3d5d3075b8bd90b7afe24283efdd586659c
@@@ -1122,9 -1122,8 +1137,8 @@@ F tool/tostr.awk e75472c2f98dd76e06b8c9
  F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
- F tool/wherecosttest.c f407dc4c79786982a475261866a161cd007947ae
- F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
- P e7ebc8f74fe91dee26f952fdf49e427b45448667 0303d6bc7112e6f810ae1bd75cafc5ffc51f5212
- R cdd791bbe55c5aec396c46dfbe20e9e5
+ F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
 -P af7abebeb1f70466833bc766d294d721eaef746f
 -R 72ea412e1f005785e4d9ffe166caaf06
++P cdd3838b7876639cf99904b2054884247fbff529 fc5552da0d3c41aea58292d267c247f9ca8ed474
++R ed045d2f64c97650097a00687a5a6562
  U drh
- Z 7030b9cbfaf54b170da506be7cca2cb4
 -Z 5e82c322ecc9e035c3abfaf4bdd53129
++Z 4fa40793a65e72ae16d2bb15a973a4b7

diff --cc manifest.uuid
index 66c3a7fdb8bdc1239a74dae80aacea66c2a06b7d,9d26a0616b70559a30eb49b891f0688a23699398..2841529b1ef1d5f90b8f6e0725ff3966fd35b0fa
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- cdd3838b7876639cf99904b2054884247fbff529
 -fc5552da0d3c41aea58292d267c247f9ca8ed474
++136445ba020c9475d3f5a7843d7d0add98477138

diff --cc src/delete.c
Simple merge

diff --cc src/insert.c
Simple merge

diff --cc src/main.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/tclsqlite.c
Simple merge

diff --cc src/update.c
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbeInt.h
Simple merge

diff --cc src/vdbeapi.c
Simple merge

diff --cc src/vdbeaux.c
Simple merge

diff --cc test/permutations.test
Simple merge