Merge 3.9.0 prerelease changes into the apple-osx branch.

FossilOrigin-Name: 1900ce011c7e0c10d670d86833ac701ecf4fa223

diff --cc main.mk
Simple merge

diff --cc manifest
index 0a5b2466d55a16a7eaca3058e2ad6937c2f1cbec,2b8b0a9573c6d13c65d7e36a9508d7851bf90466..c54b0921c3b1a5059089eadb7ccbacf9e20d1c7d
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,7 -1,7 +1,7 @@@
- C Merge\sall\schanges\sthrough\sthe\sfirst\s3.9.0\sbeta\sfrom\strunk.
- D 2015-10-09T17:28:56.474
 -C Remove\sthe\sunused\sfts5ExprColsetTest()\sroutine.
 -D 2015-10-12T22:31:02.804
++C Merge\s3.9.0\sprerelease\schanges\sinto\sthe\sapple-osx\sbranch.
++D 2015-10-13T17:49:19.827
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in f0088ff0d2ac949fce6de7c00f13a99ac5bdb663
 +F Makefile.in 0f9801da22670ba81bd7b6a17a0db2ea52650841
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
  F Makefile.msc 0ed934b4ae6a5ec0b9d7e770104864f8372414ab
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
@@@ -267,7 -264,7 +267,7 @@@ F ext/userauth/userauth.c 5fa3bdb492f48
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk 724659365348ce91a01eb34a4e76b76616fc7b0e
 -F main.mk 645d30a780fb304cf7fa79537b78728e32dd46fc
++F main.mk 1fdae452c5881b5eabab470acf91e013269fbd93
  F mkopcodec.awk c2ff431854d702cdd2d779c9c0d1f58fa16fa4ea
  F mkopcodeh.awk 0e7f04a8eb90f92259e47d80110e4e98d7ce337a
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
@@@ -288,10 -285,10 +288,10 @@@ F src/auth.c b56c78ebe40a2110fd361379f7
  F src/backup.c c3a9c4209439b806c44cf30daf466955727bf46c
  F src/bitvec.c d1f21d7d91690747881f03940584f4cc548c9d3d
  F src/btmutex.c 45a968cc85afed9b5e6cf55bf1f42f8d18107f79
- F src/btree.c 4c60a119d7fc66aaec70260d793e266d610ff6dc
 -F src/btree.c 0b74bc28b2dc907cba03b5b4b3b81584273be699
++F src/btree.c 7893a74448bcac7e3ea1e2308dd38e12dd92d351
  F src/btree.h 40189aefdc2b830d25c8b58fd7d56538481bfdd7
  F src/btreeInt.h 8177c9ab90d772d6d2c6c517e05bed774b7c92c0
- F src/build.c 0549b56722f15c146ca21f82a33838365c2031f0
+ F src/build.c d6162335d690396dfc5c4bd59e8b2b0c14ba6285
  F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0
  F src/complete.c addcd8160b081131005d5bc2d34adf20c1c5c92f
  F src/ctime.c 509ef9c64d1321f42448f111da86400b1799218a
@@@ -306,12 -303,12 +306,12 @@@ F src/global.c 508e4087f7b41d688e4762dc
  F src/hash.c 4263fbc955f26c2e8cdc0cf214bc42435aa4e4f5
  F src/hash.h c8f3c31722cf3277d03713909761e152a5b81094
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
- F src/insert.c a9b7f200081fa1b482a4ccac05165e10371ae9e0
+ F src/insert.c 3c522beb5bf50a2efee1fca1e80fd40942e5817c
  F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
 -F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e
 +F src/legacy.c 9c17d86e06522c261307f0eb6bcb1254c8b04a59
  F src/lempar.c d344a95d60c24e2f490ee59db9784b1b17439012
- F src/loadext.c f0b66d28e377fd6c6d36cc9d92df1ff251ebee44
+ F src/loadext.c c5916a158f1fb74d955847c84f7ebdb6f5de9d8c
 -F src/main.c fec97668771438033a7559883401067b139729e1
 +F src/main.c 60b45cb19dd4e3f276d70a76a7326606e234e74d
  F src/malloc.c 3a37ce6979a40f499d8cea9e9ab4e8517854d35d
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c abe6ee469b6c5a35c7f22bfeb9c9bac664a1c987
@@@ -346,13 -343,12 +346,13 @@@ F src/printf.c 0c4bcdd1c2e2521024f0a69c
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
  F src/resolve.c 1954a0f01bf65d78d7d559aea3d5c67f33376d91
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
- F src/select.c 2c4bfdf7c797df9b43121ed7850bf939b6f27405
+ F src/select.c 0bc9cd2e1cacfdc9cdc9a83884cc100f166e80a4
  F src/shell.c d25df04168d6ba5a4fa05bdbf859df667f9eb621
- F src/sqlite.h.in 847154a6981594a0fd372fb08dd13ea620036a2a
 -F src/sqlite.h.in dc35357824c6bb84a04acd4e99dee3e07299a8c6
++F src/sqlite.h.in 95d147c55638c7b8e9e096e27495bcef59b72668
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
- F src/sqlite3ext.h 64350bf36833a56ad675e27392a913f417c5c308
 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1
 -F src/sqliteInt.h e21cc96bc24161df7373f6b24367cf580496889d
+ F src/sqlite3ext.h 4b66e3e3435da4b4c8c83696d0349f0c503b3924
 +F src/sqliteInt.h 530f13b432ea748dd98a3b9cae2e856918d27128
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c f266ad8a2892d659b74f0f50cb6a88b6e7c12179
  F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
@@@ -426,9 -422,9 +426,9 @@@ F src/wal.h 6b3a67ecd7172dcc9f18fc9cd4d
  F src/walker.c 2e14d17f592d176b6dc879c33fbdec4fbccaa2ba
  F src/where.c 4c4646675e794ac71e701289edefd7cd81bac844
  F src/whereInt.h 7892bb54cf9ca0ae5c7e6094491b94c9286dc647
- F src/wherecode.c a32bf1f304f6328e3eefcb82e70bd86836cff343
+ F src/wherecode.c cdfff200d065e7fb1af827b3274ed46b10a91d65
  F src/whereexpr.c e63244ca06c503e5f3c5b7f3c9aea0db826089ed
 -F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 +F test/8_3_names.test 05034aadccd2253ffe6cbefb06662b8aa4600f77
  F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
  F test/aggnested.test b35b4cd69fc913f90d39a575e171e1116c3a4bb7
@@@ -1395,7 -1390,7 +1395,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 4dd06d8ba1548552a4fc781207efda810cf34e55 8a4e19888f512c3ee95aa3040924fc932fbdab1a
- R 667c59f235bd76705bff252a3aedd71c
 -P 7f896a971c5953d5370215ecd834d1fb711b4263
 -R 9caea6f3d0d85e53ac44439278fad807
++P 1ccae39b8a7094c2cee2f3fea57c847d0063fa81 9ecafc0c94102dca6da192f400278399464086fb
++R fabf24b95e012c3a1542d89da941f547
  U drh
- Z cdd7a124c72bd1d86b7b29499485a5be
 -Z 910ebb884723e98753b60b18fc83ff4b
++Z e6ba91c2b45e36708e68a01eecfdc42d

diff --cc manifest.uuid
index 9f8b0526105bdf3b94f63fb910c56d1277b088b0,9f4eab788ac41b694197eb304e5ab6a1b4b8fa09..8cb7dd70608e7f164c62552e627a4720ce9e5794
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 1ccae39b8a7094c2cee2f3fea57c847d0063fa81
 -9ecafc0c94102dca6da192f400278399464086fb
++1900ce011c7e0c10d670d86833ac701ecf4fa223

diff --cc src/btree.c
Simple merge

diff --cc src/sqlite.h.in
Simple merge