Merge the STAT4 capability into trunk.

FossilOrigin-Name: a32af0abe5fa6d570604fa3534e8230d5b6042fc

diff --cc manifest
index 183ea44fcb3cf14553e4589935aee9787cf44464,36d9810593b788bf559895f50f80b513024f51e2..41b9caf087358b9ad24b92fc6d4c4308dd2f472f
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\sfor\sbuilds\swith\sboth\sSQLITE_OMIT_WAL\sand\sSQLITE_MAX_MMAP_SIZE=0\sdefined.
- D 2013-08-26T14:30:25.813
 -C Adjustments\sto\s#ifdefs\sin\sanalyze.c\sto\sall\sa\sclean\scompile\swith\sno\nextra\scode\swith\sboth\sENABLE_STAT3\sand\sENABLE_STAT4\sand\swith\sneither.
 -D 2013-08-17T18:57:15.775
++C Merge\sthe\sSTAT4\scapability\sinto\strunk.
++D 2013-08-26T23:18:06.972
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -156,26 -156,26 +156,26 @@@ F spec.template 86a4a43b99ebb3e75e6b9a7
  F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
  F sqlite3.1 6be1ad09113570e1fc8dcaff84c9b0b337db5ffc
  F sqlite3.pc.in ae6f59a76e862f5c561eb32a380228a02afc3cad
- F src/alter.c f8db986c03eb0bfb221523fc9bbb9d0b70de3168
- F src/analyze.c a33fcb0b3a399d966951feb9f32115106b3ecc2e
+ F src/alter.c 2af0330bb1b601af7a7789bf7229675fd772a083
+ F src/analyze.c 10a4f1cda87aec6c56760c66e5feaaf1cdc9a641
 -F src/attach.c 1816f5a9eea8d2010fc2b22b44f0f63eb3a62704
 +F src/attach.c fea00cab11c854646a27641a263f5876569a51f9
  F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
 -F src/backup.c 43b348822db3e4cef48b2ae5a445fbeb6c73a165
 +F src/backup.c 2f1987981139bd2f6d8c728d64bf09fb387443c3
  F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
  F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
- F src/btree.c b7cbb0bcc61cbf1e0ed3cfcc79ee12ffcf4f469e
 -F src/btree.c 15ea4e980ba5edeb9b495f001e86a0688f46ee2c
 -F src/btree.h 6fa8a3ff2483d0bb64a9f0105a8cedeac9e00cca
 -F src/btreeInt.h eecc84f02375b2bb7a44abbcbbe3747dde73edb2
 -F src/build.c c2e4d057c833b616c6e32e690c29c03ba949b571
++F src/btree.c b9b57df546df2636294bfb21a986f5707b417df2
 +F src/btree.h bfe0e8c5759b4ec77b0d18390064a6ef3cdffaaf
 +F src/btreeInt.h 51cf220a9b9223354770883e93a859dc377aa27f
- F src/build.c f99a715ff9290996b579d5e1ec8e94239dc9ae5e
++F src/build.c f63e8929c7f89c0074fbc74929bc946ea117b2f8
  F src/callback.c d7e46f40c3cf53c43550b7da7a1d0479910b62cc
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
- F src/ctime.c 4262c227bc91cecc61ae37ed3a40f08069cfa267
+ F src/ctime.c ea4b7f3623a0fcb1146e7f245d7410033e86859c
  F src/date.c 067a81c9942c497aafd2c260e13add8a7d0c7dd4
  F src/delete.c 2317c814866d9aa71fea16b3faf4fdd4d6a49b94
 -F src/expr.c 0bbb44462a19169189b2709fbbd800950521b5ae
 +F src/expr.c 6bab61c757c4c4c94a92e98d507025d5d18afd3c
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c 914a6bbd987d857c41ac9d244efa6641f36faadb
- F src/func.c d7be77897c91d5b9887beb372f1e6deb515c92af
 -F src/func.c 78c371ddfb0bb2d4c4356e8d7336b582d4ca96a9
++F src/func.c 5b064acd303b3e74f019ab551d423ff6cace4023
  F src/global.c 5caf4deab621abb45b4c607aad1bd21c20aac759
  F src/hash.c ac3470bbf1ca4ae4e306a8ecb0fdf1731810ffe4
  F src/hash.h 8890a25af81fb85a9ad7790d32eedab4b994da22
@@@ -217,11 -217,11 +217,11 @@@ F src/random.c 0b2dbc37fdfbfa6bd455b091
  F src/resolve.c 9d53899cc6e1f4ec0b4632d07e97d57827bf63b9
  F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
  F src/select.c 8b148eb851f384412aea57091659d14b369918ca
- F src/shell.c 1c317a4c96d61d8d9fdad9fd1811d9b10b8c7f57
 -F src/shell.c 128eb16ccec68509a4a2f1948f2483819bf63425
++F src/shell.c 00a23311466829d9b77f0be4f7cedee9328279db
  F src/sqlite.h.in bd1451ba1ab681022a53bccc3c39580ba094a3ff
  F src/sqlite3.rc fea433eb0a59f4c9393c8e6d76a6e2596b1fe0c0
  F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
- F src/sqliteInt.h 124e4b19cd5533116909ccf203bdcdd04a28f99a
 -F src/sqliteInt.h 85cc797544e30cf585507b2127b4a3f60478c849
++F src/sqliteInt.h f3636620ad376f65bdbbf5e183f0e4309cb7526e
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -273,24 -273,24 +273,24 @@@ F src/test_vfstrace.c 34b544e80ba7fb77b
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/tokenize.c 70061085a51f2f4fc15ece94f32c03bcb78e63b2
  F src/trigger.c 5c0ea9b8755e7c5e1a700f3e27ac4f8d92dd221e
- F src/update.c 7f3fe64d8f3b44c44a1eac293f0f85f87c355b7a
- F src/utf.c 8d819e2e5104a430fc2005f018db14347c95a38f
+ F src/update.c 7d9d38e4f341ada7d79035ea969cdefb8b9014d1
+ F src/utf.c 6fc6c88d50448c469c5c196acf21617a24f90269
  F src/util.c f566b5138099a2df8533b190d0dcc74b7dfbe0c9
  F src/vacuum.c d9c5759f4c5a438bb43c2086f72c5d2edabc36c8
- F src/vdbe.c d37aee2c89e2a589f2b1599e0178eb17a08a3ccb
 -F src/vdbe.c c9488a255843c815a4bbb58ca7ad2fa871150d69
++F src/vdbe.c 2b1cd2c7e3d74e6aa99ce2f538bfdd07a00dc2f1
  F src/vdbe.h 4f554b5627f26710c4c36d919110a3fc611ca5c4
 -F src/vdbeInt.h e9b7c6b165a31a4715c5aa97223d20d265515231
 -F src/vdbeapi.c 4d13580bd058b39623e8fcfc233b7df4b8191e8b
 -F src/vdbeaux.c a6ea36a9dc714e1128a0173249a0532ddcab0489
 +F src/vdbeInt.h cbe71b8b36d8b3bba5709cc3f436c7e3b47b7b08
 +F src/vdbeapi.c 96b24b946cf21894f63d9393e821baa2f0a80979
 +F src/vdbeaux.c c7fe2695e256dbf254113c4fe90d3ec9aabe3bbe
  F src/vdbeblob.c 5dc79627775bd9a9b494dd956e26297946417d69
- F src/vdbemem.c 61d5ddb8e4d4e14f625062bf5bcc7ce08bb20af3
 -F src/vdbemem.c 466784a5626d9cf45ed28a187ef809471b8a5675
++F src/vdbemem.c 1bec36bf054521df810b2f9cc5078cba929ff10d
  F src/vdbesort.c 3937e06b2a0e354500e17dc206ef4c35770a5017
  F src/vdbetrace.c e7ec40e1999ff3c6414424365d5941178966dcbc
 -F src/vtab.c 2e8b489db47e20ae36cd247932dc671c9ded0624
 +F src/vtab.c 165ce0e797c2cd23badb104c9f2ae9042d6d942c
  F src/wal.c 7dc3966ef98b74422267e7e6e46e07ff6c6eb1b4
  F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
  F src/walker.c 4fa43583d0a84b48f93b1e88f11adf2065be4e73
- F src/where.c 6e718c39d6b2964f15f6c96ce5938b4652e3538e
 -F src/where.c 9be69c42a02376c46d44907b38edd70f8a2cea7a
++F src/where.c 18cd15160c089dd7854febeaf5a9c065fce6a95a
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
  F test/aggnested.test 45c0201e28045ad38a530b5a144b73cd4aa2cfd6
@@@ -590,8 -592,8 +592,8 @@@ F test/index2.test ee83c6b5e3173a3d7137
  F test/index3.test 423a25c789fc8cc51aaf2a4370bbdde2d9e9eed7
  F test/index4.test 2983216eb8c86ee62d9ed7cb206b5cc3331c0026
  F test/index5.test fc07c14193c0430814e7a08b5da46888ee795c33
- F test/index6.test 6a754747f444fecb7f4ae50ce4ac7a0d269e090d
 -F test/index6.test d84c03a7c16222b874877e8f4efb2bb7fed5d29e
 -F test/indexedby.test 0e959308707c808515c3a51363f7a9835027108c
++F test/index6.test e96324d8c1ade4b30a4c6cee14b1fc2e5a367cda
 +F test/indexedby.test b2f22f3e693a53813aa3f50b812eb609ba6df1ec
  F test/indexfault.test 31d4ab9a7d2f6e9616933eb079722362a883eb1d
  F test/init.test 15c823093fdabbf7b531fe22cf037134d09587a7
  F test/insert.test 489aa12a027c83d291f5034a83c8c32e6be1dca2
@@@ -714,11 -716,11 +716,11 @@@ F test/pagesize.test 1dd51367e752e742f5
  F test/pcache.test b09104b03160aca0d968d99e8cd2c5b1921a993d
  F test/pcache2.test a83efe2dec0d392f814bfc998def1d1833942025
  F test/percentile.test b98fc868d71eb5619d42a1702e9ab91718cbed54
- F test/permutations.test 461ef4ea10db02cd421dfe5f988eac3e99b5cd9a
+ F test/permutations.test c5e7ae8a18cb8a0ced38dbbc9e2463536c1de45b
  F test/pragma.test 5e7de6c32a5d764f09437d2025f07e4917b9e178
 -F test/pragma2.test 3a55f82b954242c642f8342b17dffc8b47472947
 +F test/pragma2.test 224f0381f9411a78ae685cac24c13656a62021b7
  F test/printf.test ec9870c4dce8686a37818e0bf1aba6e6a1863552
 -F test/progress.test 552dc1edc37333a8d3098b8c26a2b7f06f5799d7
 +F test/progress.test a282973d1d17f08071bc58a77d6b80f2a81c354d
  F test/ptrchng.test ef1aa72d6cf35a2bbd0869a649b744e9d84977fc
  F test/queryonly.test 5f653159e0f552f0552d43259890c1089391dcca
  F test/quick.test 1681febc928d686362d50057c642f77a02c62e57
@@@ -1047,8 -1049,8 +1049,8 @@@ F test/where6.test 5da5a98cec820d488e82
  F test/where7.test 5a4b0abc207d71da4deecd734ad8579e8dd40aa8
  F test/where8.test 6f95896633cf2d307b5263145b942b7d33e837c6
  F test/where8m.test da346596e19d54f0aba35ebade032a7c47d79739
- F test/where9.test 9a7fda4a4512abc26a855e8b2b6572b200f6019b
+ F test/where9.test 74245dea86592a744b758dff2e7daf0a07bade7d
 -F test/whereA.test 24c234263c8fe358f079d5e57d884fb569d2da0a
 +F test/whereA.test 4d253178d135ec46d1671e440cd8f2b916aa6e6b
  F test/whereB.test 0def95db3bdec220a731c7e4bec5930327c1d8c5
  F test/whereC.test d6f4ecd4fa2d9429681a5b22a25d2bda8e86ab8a
  F test/whereD.test 6c2feb79ef1f68381b07f39017fe5f9b96da8d62
@@@ -1105,7 -1107,7 +1107,7 @@@ F tool/warnings-clang.sh f6aa929dc20ef1
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
  F tool/wherecosttest.c f407dc4c79786982a475261866a161cd007947ae
  F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
- P f64cd21e2e23ed7cff48f7dafa5e76adde9321c2
- R 2c7ed4c326daab71e6477ad6fcbe3595
- U dan
- Z 1fc299d2108dcbca170e4fd8db67c42b
 -P 5c591104813a7e55e59f4f557cbb3e500fa817c2
 -R fed6486268a39dfc52589cfac215691e
++P edd5dbdc3239fc88799b822941603fcc828ecbb6 f86b75b6c7290ee6ddb3636090b00e99fc68c45e
++R f565ac94f1ba86f7abdb8be442158ff1
+ U drh
 -Z ee5235686bd18f87bb4458ce74357891
++Z 3380b8636b10d59476656dd5f78e188d

diff --cc manifest.uuid
index a436785de31d6b0ad1b284dfd5884d12d868a720,cce34a49dba1c846aee1b486d5a5c1217467f939..877123ce44e3b52faa725bda2d5d2b8c8e024195
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- edd5dbdc3239fc88799b822941603fcc828ecbb6
 -f86b75b6c7290ee6ddb3636090b00e99fc68c45e
++a32af0abe5fa6d570604fa3534e8230d5b6042fc

diff --cc src/btree.c
Simple merge

diff --cc src/build.c
Simple merge

diff --cc src/func.c
Simple merge

diff --cc src/shell.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbemem.c
Simple merge

diff --cc src/where.c
Simple merge

diff --cc test/index6.test
Simple merge