Merge latest trunk changes with this branch.

FossilOrigin-Name: 08f74c45ecf711a2373af578d44470add9082377

diff --cc manifest
index a0b0db322a1ac58b26a72c3e28d69eb25343aebc,190659f0f2e81798394967826fbba6ae2764f617..924a46707c4175c9650188a612c1933ab25643d5
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\stypos\sin\sa\scomment\sin\sanalyze.c.\sNo\scode\schanges.
- D 2013-08-07T16:38:33.619
 -C Add\sa\sguard\s#ifndef\sto\stest_intarray.h\sto\sprevent\sharm\sif\sit\sis\s#included\nmore\sthan\sonce.\s\sAdd\sa\scomment\son\sthe\sclosing\s#endif\sof\sthe\sguards\son\nsqlite3.h\sand\stest_multiplex.h.
 -D 2013-08-07T14:18:45.279
++C Merge\slatest\strunk\schanges\swith\sthis\sbranch.
++D 2013-08-07T18:42:27.752
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -163,16 -163,16 +163,16 @@@ F src/auth.c 523da7fb4979469955d822ff92
  F src/backup.c 43b348822db3e4cef48b2ae5a445fbeb6c73a165
  F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
  F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
 -F src/btree.c 3f7bbfd72efb1cbf6a49515c376a031767ec930a
 +F src/btree.c 15ea4e980ba5edeb9b495f001e86a0688f46ee2c
  F src/btree.h 6fa8a3ff2483d0bb64a9f0105a8cedeac9e00cca
  F src/btreeInt.h eecc84f02375b2bb7a44abbcbbe3747dde73edb2
- F src/build.c b2771cc57484ee4225a9eb6e57e6933be3f96e3b
 -F src/build.c cee4724668ebc09bb482c1be30f96e0ae2474f9b
++F src/build.c c2e4d057c833b616c6e32e690c29c03ba949b571
  F src/callback.c d7e46f40c3cf53c43550b7da7a1d0479910b62cc
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
 -F src/ctime.c 4262c227bc91cecc61ae37ed3a40f08069cfa267
 +F src/ctime.c 177fa0cbf28b8deda3f216603beee0b883408a40
  F src/date.c 067a81c9942c497aafd2c260e13add8a7d0c7dd4
  F src/delete.c 2317c814866d9aa71fea16b3faf4fdd4d6a49b94
- F src/expr.c 2068a7c17e45f8bee6e44205b059aa30acbc71c5
+ F src/expr.c 0bbb44462a19169189b2709fbbd800950521b5ae
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c 914a6bbd987d857c41ac9d244efa6641f36faadb
  F src/func.c 5c50c1ea31fd864b0fe921fe1a8d4c55acd609ef
@@@ -216,12 -216,12 +216,12 @@@ F src/printf.c 41c49dac366a3a411190001a
  F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
  F src/resolve.c 17e670996729ac41aadf6a31f57b4e6f29b3d819
  F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
- F src/select.c 20369c82dc38eb4a77b458c8f6e353ef550580c9
- F src/shell.c cb075e24f125e08cc6deb4d8837b0b7ff394e65d
- F src/sqlite.h.in 442c109e0c3447c34b1794971ecdb673ce08a843
+ F src/select.c 8b148eb851f384412aea57091659d14b369918ca
 -F src/shell.c 927e17b37b63b24461e372d982138fb22c4df321
++F src/shell.c 128eb16ccec68509a4a2f1948f2483819bf63425
+ F src/sqlite.h.in bd1451ba1ab681022a53bccc3c39580ba094a3ff
  F src/sqlite3.rc fea433eb0a59f4c9393c8e6d76a6e2596b1fe0c0
  F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
- F src/sqliteInt.h 42adcd08a254fe14d8a369cf6381cf15e2e2e971
 -F src/sqliteInt.h def0e436c0d4ca5084305ca6ae898020fbafaae4
++F src/sqliteInt.h dfb02189a27dac993ee6635017dd3d6926508f5a
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -236,14 -236,14 +236,14 @@@ F src/test7.c 126b886b53f0358b92aba9b81
  F src/test8.c 7ee77ea522ae34aa691dfe407139dec80d4fc039
  F src/test9.c bea1e8cf52aa93695487badedd6e1886c321ea60
  F src/test_async.c 21e11293a2f72080eda70e1124e9102044531cd8
- F src/test_autoext.c 32cff3d01cdd3202486e623c3f8103ed04cb57fa
+ F src/test_autoext.c dea8a01a7153b9adc97bd26161e4226329546e12
  F src/test_backup.c 3875e899222b651e18b662f86e0e50daa946344e
  F src/test_btree.c 5b89601dcb42a33ba8b820a6b763cc9cb48bac16
 -F src/test_config.c 95bb33e9dcaa340a296c0bf0e0ba3d1a1c8004c0
 +F src/test_config.c 636ecd15a6ba18bf97a590b5a21f47573c8c2b65
- F src/test_demovfs.c 20a4975127993f4959890016ae9ce5535a880094
+ F src/test_demovfs.c 69b2085076654ebc18014cbc6386f04409c959a9
  F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
- F src/test_fs.c 8f786bfd0ad48030cf2a06fb1f050e9c60a150d7
+ F src/test_fs.c ced436e3d4b8e4681328409b8081051ce614e28f
 -F src/test_func.c 3a8dd37c08ab43b76d38eea2836e34a3897bf170
 +F src/test_func.c fcd238feb694332d5962ee08578ef30ff4ac6559
  F src/test_hexio.c abfdecb6fa58c354623978efceb088ca18e379cd
  F src/test_init.c 3cbad7ce525aec925f8fda2192d576d47f0d478a
  F src/test_intarray.c 87847c71c3c36889c0bcc9c4baf9d31881665d61
@@@ -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 91fa72a040cb1065045fce5e84196be093e29918
 -F src/vdbe.c 4914ae1d00045a5310aea9e0f7c9a8edd3d9f856
++F src/vdbe.c a3c98ec54d27b30b67b6247ed0a29268de11dc17
  F src/vdbe.h 4f554b5627f26710c4c36d919110a3fc611ca5c4
  F src/vdbeInt.h e9b7c6b165a31a4715c5aa97223d20d265515231
  F src/vdbeapi.c 4d13580bd058b39623e8fcfc233b7df4b8191e8b
- F src/vdbeaux.c 4389b3692969b4415fcfd00de36818a02f84df28
+ F src/vdbeaux.c a6ea36a9dc714e1128a0173249a0532ddcab0489
  F src/vdbeblob.c 5dc79627775bd9a9b494dd956e26297946417d69
 -F src/vdbemem.c 833005f1cbbf447289f1973dba2a0c2228c7b8ab
 +F src/vdbemem.c f0512045147702adec3ca6388663e243c17d2ea4
  F src/vdbesort.c 3937e06b2a0e354500e17dc206ef4c35770a5017
  F src/vdbetrace.c e7ec40e1999ff3c6414424365d5941178966dcbc
  F src/vtab.c 2e8b489db47e20ae36cd247932dc671c9ded0624
  F src/wal.c 7dc3966ef98b74422267e7e6e46e07ff6c6eb1b4
  F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
  F src/walker.c 4fa43583d0a84b48f93b1e88f11adf2065be4e73
- F src/where.c 4e188dc4a1f668d761750eb27e603616179806d0
 -F src/where.c ea01a52eb31e54dda97b8e39c2e5b38faa13dce5
++F src/where.c 0051a3640491a67ce2d4abcbffc687a818bb49f7
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
  F test/aggnested.test 45c0201e28045ad38a530b5a144b73cd4aa2cfd6
@@@ -591,7 -590,7 +591,7 @@@ F test/index2.test ee83c6b5e3173a3d7137
  F test/index3.test 423a25c789fc8cc51aaf2a4370bbdde2d9e9eed7
  F test/index4.test 2983216eb8c86ee62d9ed7cb206b5cc3331c0026
  F test/index5.test fc07c14193c0430814e7a08b5da46888ee795c33
- F test/index6.test 0005b3093012c6d0f20cc54d9057210221216143
 -F test/index6.test f53a788b813eb6937346867bae9e587c434dd9a1
++F test/index6.test 5be279e46e5f40e2dcc67d9b2aecdb5b0031db18
  F test/indexedby.test 0e959308707c808515c3a51363f7a9835027108c
  F test/indexfault.test 31d4ab9a7d2f6e9616933eb079722362a883eb1d
  F test/init.test 15c823093fdabbf7b531fe22cf037134d09587a7
@@@ -1106,7 -1105,7 +1106,7 @@@ F tool/warnings-clang.sh f6aa929dc20ef1
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
  F tool/wherecosttest.c f407dc4c79786982a475261866a161cd007947ae
  F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
- P 13ed5ac13562e7a39905d70fd47059f4d8001bba
- R 084c38143e1dba830587618d10f058e0
 -P f8d8790ede0fcaf6c5b60ac22919c1d97c74e838
 -R 2f7b5cf183df4b523d2c445c6f8fcaa5
 -U drh
 -Z cdc793001b4bb9536e6929a443adf8d1
++P 812ed0c58fc5f729a2d4f16775fad6724cc367a6 0ad83ceb79767738bd06a28840cf84da0464ab4f
++R d674ab11a2de1d9766d2ac27cc923b51
 +U dan
- Z 1a4859355b309a8c52cef488ffe4e611
++Z 85dc674af92c540fb0c7cdb1bc5adf5a

diff --cc manifest.uuid
index c1071fb6cee6987955d4e0a27ebf882867a70203,bcffddd0ea3fdbf3bbb5bdc917f0d37bdaed8c91..3eba2617364690e786fbba42e4b1abff08434b70
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 812ed0c58fc5f729a2d4f16775fad6724cc367a6
 -0ad83ceb79767738bd06a28840cf84da0464ab4f
++08f74c45ecf711a2373af578d44470add9082377

diff --cc src/build.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/where.c
Simple merge

diff --cc test/index6.test
index e9ea570b838d10eb65986c126a69d6255fd18440,d70e86aefebb66fe2c5b8914081223d8f33339c1..d2c2e981384338f03a7da088a01132f3d32450b7
--- 1/test/index6.test
--- 2/test/index6.test
+++ b/test/index6.test
@@@ -144,12 -144,21 +144,21 @@@ do_test index6-2.2 
      SELECT * FROM t2 WHERE a=5;
    }
  } {/.* TABLE t2 USING INDEX t2a1 .*/}
- do_test index6-2.3 {
-   execsql {
-     EXPLAIN QUERY PLAN
-     SELECT * FROM t2 WHERE a IS NOT NULL;
-   }
- } {/.* TABLE t2 USING INDEX t2a1 .*/}
 -ifcapable stat3 {
 -  do_test index6-2.3stat3 {
++ifcapable stat4 {
++  do_test index6-2.3stat4 {
+     execsql {
+       EXPLAIN QUERY PLAN
+       SELECT * FROM t2 WHERE a IS NOT NULL;
+     }
+   } {/.* TABLE t2 USING INDEX t2a1 .*/}
+ } else {
 -  do_test index6-2.3stat3 {
++  do_test index6-2.3stat4 {
+     execsql {
+       EXPLAIN QUERY PLAN
+       SELECT * FROM t2 WHERE a IS NOT NULL AND a>0;
+     }
+   } {/.* TABLE t2 USING INDEX t2a1 .*/}
+ }
  do_test index6-2.4 {
    execsql {
      EXPLAIN QUERY PLAN