Merge recent trunk changes into the threads branch.

FossilOrigin-Name: 8729aa3e3ed1da2e15408ef8705cbe185cd2a5ac

diff --cc manifest
index 5fdab138c8b56b1d5e8ceeb6b48d0c5ab249128b,97b4f2b46f3e239df96c6d2deb8bb33d02823a81..ae525eafb2e6d30ff53defcf0bce8a421f45b71f
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Fix\sbuild\sproblems\sin\svdbesort.c.\sAdd\sfurther\scomments\sand\schanges\sto\smake\sthings\seasier\sto\sunderstand.
- D 2014-04-17T08:57:17.925
 -C Add\sthe\sSQLITE_RUNTIME_BYTEORDER\scompile-time\soption\sto\sforce\sSQLite\sto\scheck\nthe\sprocessor\sbyte-order\sat\srun-time.\s\sAdd\sadditional\scompile-time\sbyte\sorder\nchecks\sfor\sARM,\sPPC,\sand\sSPARC.
 -D 2014-04-18T00:49:29.419
++C Merge\srecent\strunk\schanges\sinto\sthe\sthreads\sbranch.
++D 2014-04-18T12:38:54.966
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
 +F Makefile.in ad0921c4b2780d01868cf69b419a4f102308d125
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc fdacba6fb574868c71fde6db6b77789a383a4c19
 +F Makefile.msc 153eb9b9725bc7b8e4dbe963219298e0c4a644b0
  F Makefile.vxworks db21ed42a01d5740e656b16f92cb5d8d5e5dd315
  F README.md 64f270c43c38c46de749e419c22f0ae2f4499fe8
  F VERSION 9f823c026c6a32fc5f84d212a8aae0a221dba45c
@@@ -164,10 -164,10 +164,10 @@@ F src/auth.c 523da7fb4979469955d822ff92
  F src/backup.c a729e63cf5cd1829507cb7b8e89f99b95141bb53
  F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
  F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
- F src/btree.c 0d1be67448c45eccc40114556186397eb9da7f7d
- F src/btree.h 232836cb51753f2e96aa8ce0f052c6df850f76ba
- F src/btreeInt.h 0be66063468a520e4d66b80c7a1dc26d04ee6ea4
- F src/build.c e120a3693ac78ab3e74048205f07a3a522d9b982
 -F src/btree.c 6c9b51abd404ce5b78b173b6f2248e8cb824758c
++F src/btree.c 1e8fa0e597f73cc1b144285065f175f5a661ee75
+ F src/btree.h d79306df4ed9181b48916737fe8871a4392c4594
+ F src/btreeInt.h cf180d86b2e9e418f638d65baa425c4c69c0e0e3
 -F src/build.c 5bfeea8f302ec2926c9eea321a61daea92a29fa4
++F src/build.c 9ea11e29230d8f454580870465354c707bd42851
  F src/callback.c 174e3c8656bc29f91d710ab61550d16eea34be98
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
  F src/ctime.c 0231df905e2c4abba4483ee18ffc05adc321df2a
@@@ -186,7 -186,7 +186,7 @@@ F src/journal.c b4124532212b6952f42eb2c
  F src/legacy.c 0df0b1550b9cc1f58229644735e317ac89131f12
  F src/lempar.c cdf0a000315332fc9b50b62f3b5e22e080a0952b
  F src/loadext.c 867c7b330b740c6c917af9956b13b81d0a048303
- F src/main.c fcceb01d74a79c2d7984f33545b35b06da3bb1e8
 -F src/main.c 0a8cfb6b2899649880e5874ac9bfd1c6f7c6a4a3
++F src/main.c 2ba4f6eeb84cf8efd8bb632c1abe203dc86adcac
  F src/malloc.c 0203ebce9152c6a0e5de520140b8ba65187350be
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c c0c990fcaddff810ea277b4fb5d9138603dd5d4b
@@@ -216,13 -216,13 +216,13 @@@ F src/prepare.c 677521ab7132615a8a26107
  F src/printf.c e5a0005f8b3de21f85da6a709d2fbee76775bf4b
  F src/random.c d10c1f85b6709ca97278428fd5db5bbb9c74eece
  F src/resolve.c 273d5f47c4e2c05b2d3d2bffeda939551ab59e66
- F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
+ F src/rowset.c a9c9aae3234b44a6d7c6f5a3cadf90dce1e627be
 -F src/select.c 269c3e31a450fce642a10569221a49180348c88e
 -F src/shell.c 2afe7a7154e97be0c74c5feacf09626bda8493be
 -F src/sqlite.h.in bde98816e1ba0c9ffef50afe7b32f4e5a8f54fe0
 +F src/select.c 20055cf917222e660c4222fea306bd13a0623caa
- F src/shell.c b44c3f17f0bf41b3431e9cc171706251156ae85f
- F src/sqlite.h.in 81221c50addbf698c3247154d92efd1095bfd885
++F src/shell.c 6946aea9f21af551fa84bc6b2a8de55d93bf0004
++F src/sqlite.h.in 579aebacdea59386d9cdf01fd4a16f4cafbb248f
  F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
  F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
- F src/sqliteInt.h 533154bf9d8401ff3e6f8030f4373774c0a6ad41
 -F src/sqliteInt.h d3ca0bdd6743c9af2f333cb372b4bf95b19cd1fd
++F src/sqliteInt.h 788c9b7d3b17120b3d67b1af9e12c10e4f95a324
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -239,8 -239,8 +239,8 @@@ F src/test9.c bea1e8cf52aa93695487baded
  F src/test_async.c 21e11293a2f72080eda70e1124e9102044531cd8
  F src/test_autoext.c dea8a01a7153b9adc97bd26161e4226329546e12
  F src/test_backup.c 3875e899222b651e18b662f86e0e50daa946344e
- F src/test_btree.c 5b89601dcb42a33ba8b820a6b763cc9cb48bac16
+ F src/test_btree.c 2e9978eca99a9a4bfa8cae949efb00886860a64f
 -F src/test_config.c 0336e0bdbe541b4af89d7e3dd0656e8e6b51e585
 +F src/test_config.c ebd0a42983b696f2b121515d577753cf2afdc9b0
  F src/test_demovfs.c 69b2085076654ebc18014cbc6386f04409c959a9
  F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
  F src/test_fs.c ced436e3d4b8e4681328409b8081051ce614e28f
@@@ -279,14 -278,14 +279,14 @@@ F src/update.c 5b3e74a03b3811e586b4f2b4
  F src/utf.c 6dc9ec9f1b3db43ae8ba0365377f11df1ee4c01c
  F src/util.c c46c90459ef9bdc0c6c73803cf4c55425b4771cf
  F src/vacuum.c 3728d74919d4fb1356f9e9a13e27773db60b7179
- F src/vdbe.c 9f3d1b35b5fe8c7f3a4f734bd524d0df844a2576
 -F src/vdbe.c bf284edea1cee0508dc93c79a73498e0f317edb7
++F src/vdbe.c cba6c791a3621de633cc018f09c81aa472072d42
  F src/vdbe.h 394464909ed682334aa3d5831aae0c2fe2abef94
 -F src/vdbeInt.h e6d83e5bfd62fc6685ba1ed6153f7099f82de9f7
 +F src/vdbeInt.h ba1069627d0ab75e9ddb8f9c10958b86cdbd333d
  F src/vdbeapi.c 0ed6053f947edd0b30f64ce5aeb811872a3450a4
- F src/vdbeaux.c d8dc38965507a34b0e150c0d7fc82b02f8cf25ea
- F src/vdbeblob.c 15377abfb59251bccedd5a9c7d014a895f0c04aa
 -F src/vdbeaux.c e493f38758c4b8f4ca2007cf6a700bd405d192f3
++F src/vdbeaux.c 8289ed68e2262844334461ccb1b91c4d55b29b0b
+ F src/vdbeblob.c 9205ce9d3b064d9600f8418a897fc88b5687d9ac
  F src/vdbemem.c 6fc77594c60f6155404f3f8d71bf36d1fdeb4447
 -F src/vdbesort.c 4abb7c0f8f19b7d7d82f4558d5da1a30fdf9ea38
 +F src/vdbesort.c a41721a8e97735597afb80c930f04f195d86a817
  F src/vdbetrace.c 6f52bc0c51e144b7efdcfb2a8f771167a8816767
  F src/vtab.c 21b932841e51ebd7d075e2d0ad1415dce8d2d5fd
  F src/wal.c 76e7fc6de229bea8b30bb2539110f03a494dc3a8
@@@ -1164,7 -1160,7 +1164,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
  F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
- P c0c8cff17b7311bbc4fd081313a5552f927c3833
- R 5c2193354b4ddf9cc33c16483e4c137f
- U dan
- Z c671751bbf58b5cb738173e8c3e25105
 -P 9c6961967ae00e563ebe2859eaf2639a79f2cb01
 -R 1b4cbcab83595d3a8147d0a70e1ae961
++P 12b190db1d20c34390c768614b40ff58a9d3b74c 2c5363873a6f990a0abaacac6303acd46b48befc
++R bb69be65b78f81eaebedcfbb221ccbdc
+ U drh
 -Z a694f54c65c4a003c92caa29b70309b3
++Z b1d3cff21f914d2f704f3c429938823e

diff --cc manifest.uuid
index b5687b30fd50e9e04358df3b513c9b75aace9962,05a8b60e7e23e5ff2280e3f2abb5a5688a443e4c..4eee3d389b13b49905c2db7d1017398136dd4b49
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 12b190db1d20c34390c768614b40ff58a9d3b74c
 -2c5363873a6f990a0abaacac6303acd46b48befc
++8729aa3e3ed1da2e15408ef8705cbe185cd2a5ac

diff --cc src/btree.c
Simple merge

diff --cc src/build.c
Simple merge

diff --cc src/main.c
Simple merge

diff --cc src/shell.c
Simple merge

diff --cc src/sqlite.h.in
index 469504b1490912442ad5eb7ea559d920ca36382a,e8dddc468c385153d8f4a83cadd877e8e590804d..f09c374a740774c964d455064e053606b61dbcaa
--- 1/src/sqlite.h.in
--- 2/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@@ -6129,8 -6118,8 +6129,9 @@@ int sqlite3_test_control(int op, ...)
  #define SQLITE_TESTCTRL_EXPLAIN_STMT            19
  #define SQLITE_TESTCTRL_NEVER_CORRUPT           20
  #define SQLITE_TESTCTRL_VDBE_COVERAGE           21
- #define SQLITE_TESTCTRL_SORTER_MMAP             22
- #define SQLITE_TESTCTRL_LAST                    22
+ #define SQLITE_TESTCTRL_BYTEORDER               22
 -#define SQLITE_TESTCTRL_LAST                    22
++#define SQLITE_TESTCTRL_SORTER_MMAP             23
++#define SQLITE_TESTCTRL_LAST                    23
  
  /*
  ** CAPI3REF: SQLite Runtime Status

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbeaux.c
Simple merge