Merge trunk changes into this branch.

FossilOrigin-Name: d5b7c5a88dd58de85b3060a1f28b6d96e6e21207

diff --cc manifest
index 9f25f390d917be1e686b5708d6145b4714f0aeae,f76c05d5cdc6b136d2f93d7eb4d50d1689097267..f6d9403e16617acd8fed4bdc9154728a62bafc36
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Further\swork\son\sbalance_nonroot().
- D 2014-10-13T18:03:27.743
 -C Three\ssmall\soptimizations\sto\svdbeaux.c.
 -D 2014-10-13T17:42:05.891
++C Merge\strunk\schanges\sinto\sthis\sbranch.
++D 2014-10-13T18:09:13.737
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -172,10 -172,10 +172,10 @@@ F src/auth.c d8abcde53426275dab6243b441
  F src/backup.c a31809c65623cc41849b94d368917f8bb66e6a7e
  F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
  F src/btmutex.c 49ca66250c7dfa844a4d4cb8272b87420d27d3a5
- F src/btree.c 63211ca1d4ae867eede39a37901aec4746d904a7
 -F src/btree.c c9fcae8145436f728c61272cba72b1469c07f30d
++F src/btree.c 3d9d1db1d05724346876cf456a850628a9e75331
  F src/btree.h a79aa6a71e7f1055f01052b7f821bd1c2dce95c8
  F src/btreeInt.h 1bd7957161a1346a914f1f09231610e777a8e58d
- F src/build.c bde83dd5cf812e310a7e5ad2846790a14745bef4
+ F src/build.c 9dc2bd94347b878c89627000c92b0c8d97ec2919
  F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0
  F src/complete.c 535183afb3c75628b78ce82612931ac7cdf26f14
  F src/ctime.c bb434068b5308a857b181c2d204a320ff0d6c638
@@@ -215,15 -215,15 +215,15 @@@ F src/os_setup.h c9d4553b5aaa6f73391448
  F src/os_unix.c fb587121840f690101336879adfa6d0b2cd0e8c7
  F src/os_win.c 0a4042ef35f322e86fa01f6c8884c5e645b911e7
  F src/os_win.h 09e751b20bbc107ffbd46e13555dc73576d88e21
- F src/pager.c 0abcb0904a78d68b96357f360c6b160bcfc2a3e0
 -F src/pager.c a171cf9dd09c6cb162b262c328d4dfd198e04f80
 -F src/pager.h ffd5607f7b3e4590b415b007a4382f693334d428
++F src/pager.c 492aab0f963ddd7b6795de6376a38b139c767919
 +F src/pager.h 8b6707cb32c788cf36bfc3d63f6d4b4fa689e7c2
- F src/parse.y b98772da2bb5415970085b707203f92569400aa8
+ F src/parse.y 5dfead8aed90cb0c7c1115898ee2266804daff45
  F src/pcache.c 4121a0571c18581ee9f82f086d5e2030051ebd6a
  F src/pcache.h 9b559127b83f84ff76d735c8262f04853be0c59a
- F src/pcache1.c dab8ab930d4a73b99768d881185994f34b80ecaa
+ F src/pcache1.c e412cb585f777c840ddce0500eddc5c6043c2bb5
  F src/pragma.c 3f3e959390a10c0131676f0e307acce372777e0f
  F src/prepare.c 6ef0cf2f9274982988ed6b7cab1be23147e94196
- F src/printf.c 3a47f526b173813d9a7f4e7044007771ba68cde1
+ F src/printf.c 6b79bbd063dcbadca4cf617a4cde255bcc13ea64
  F src/random.c d10c1f85b6709ca97278428fd5db5bbb9c74eece
  F src/resolve.c a3466128b52a86c466e47ac1a19e2174f7b5cf89
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
@@@ -1200,7 -1204,7 +1204,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P fec849dcca3aead2bc2d4ecffeda750684d32fb0
- R 79e5b5564c934fc68257d82dc897cefd
 -P c2799aece17d347c64217a0e407bb10e50c184a3
 -R f9a2ff50dcb19a8595444c5c4cad6f5f
 -U drh
 -Z bf4e3c223808aa3476302aafe1aa8090
++P 6594f9b420e2fa642737722ff8521f756ecef227 04892f8ba6c55cec4fe37bfe59b6349fd2a40698
++R 76183a9b7ddeb938a48604dbc4dd8cd6
 +U dan
- Z ae5b74eee28666050af6baaa639de56c
++Z 504cabb1e1fb0c47450f76fec3d8495b

diff --cc manifest.uuid
index fcba485229167e9d00102b5a1c6fce992133a2fc,02b54f919a254cb08ba13f11d6534900f30814dd..32265a861c835a8435db0f02d6be246f2be2d3bf
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 6594f9b420e2fa642737722ff8521f756ecef227
 -04892f8ba6c55cec4fe37bfe59b6349fd2a40698
++d5b7c5a88dd58de85b3060a1f28b6d96e6e21207

diff --cc src/btree.c
Simple merge

diff --cc src/pager.c
Simple merge