Merge all changes for version 3.8.9 into the ota-update branch.

FossilOrigin-Name: ec9d907a57fcea72c8a64e521e8a1b5777d67568

diff --cc main.mk
Simple merge

diff --cc manifest
index 21385da2e43e1be6e964a86dfae42345f555d1ce,e3dc7c37f3dfd59b1c040d8eceff7378e8e0b852..1fb355c6557ddd51a67e98ad728e334aba2fc4cd
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Extend\s[52e73eec]\sso\sthat\sthe\sIS\soptimization\smay\sbe\sused\son\sprimary\skeys\swith\smore\sthan\s3\scolumns.
- D 2015-03-25T15:23:00.648
 -C Version\s3.8.9
 -D 2015-04-08T12:16:33.323
++C Merge\sall\schanges\sfor\sversion\s3.8.9\sinto\sthe\sota-update\sbranch.
++D 2015-04-08T14:01:07.788
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 88a3e6261286db378fdffa1124cad11b3c05f5bb
+ F Makefile.in 00d12636df7a5b08af09116bcd6c7bfd49b8b3b4
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc cd626b52ebeec0e2c0dd929243bdd25b0df19a71
+ F Makefile.msc a8d817fa486d8c88dfbd19ae6a6567d9d350de39
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
  F README.md d58e3bebc0a4145e0f2a87994015fdb575a8e866
  F VERSION 319eb1ced4b4d17a67730f2b7b85f15c1346cb60
@@@ -170,7 -152,7 +170,7 @@@ F ext/userauth/userauth.c 5fa3bdb492f48
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk cdf4a20c72d798188f63e2fd6d3eea638bddd431
 -F main.mk 997eee18387a3e69394f2f948c9c6ccf079655a4
++F main.mk 19443a29765ee87f4a4dca28818c6bbff34f738d
  F mkopcodec.awk c2ff431854d702cdd2d779c9c0d1f58fa16fa4ea
  F mkopcodeh.awk c6b3fa301db6ef7ac916b14c60868aeaec1337b5
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
@@@ -244,20 -226,20 +244,20 @@@ F src/pcache1.c 69d137620a305f814398bd2
  F src/pragma.c ac4f3f856b4234e85f55b0f069698a4766011100
  F src/pragma.h 09c89bca58e9a44de2116cc8272b8d454657129f
  F src/prepare.c 173a5a499138451b2561614ecb87d78f9f4644b9
- F src/printf.c 8da9a2687a396daa19860f4dc90975d319304744
+ F src/printf.c 8ae1fa9d30c1200a9268a390ba9e9cea9197b27a
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
- F src/resolve.c f4d79e31ffa5820c2e3d1740baa5e9b190425f2b
+ F src/resolve.c 41aa91af56d960e9414ce1d7c17cfb68e0d1c6cb
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
- F src/select.c 72ffb62e2879956302140e9f6e6ae88aee36b0e5
- F src/shell.c 3ae1e53878d2804fe77b8c8f1f6ca287a0e5d80e
- F src/sqlite.h.in 8ee1be5d82b093354c418e06e272deeb29f6f5c0
+ F src/select.c c28c52e353287434fac8473e56ee4be848d12c9d
+ F src/shell.c 84a1593bd86aaa14f4da8a8f9b16fbc239d262aa
 -F src/sqlite.h.in 278602140d49575e8708e643161f4263e428a02a
++F src/sqlite.h.in 2814e6b51c5a6176eecae4a7d5b7bfaf142283c8
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
- F src/sqliteInt.h bedf15914c09bfb5fe3ec4e3f211a4a6fc42cd33
+ F src/sqliteInt.h 107b02ed6c64162b653acc2368e982de529e14f6
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
- F src/status.c 2e5c86866ff2f30988ce10ddbaa7ba2eaf6d4146
+ F src/status.c f266ad8a2892d659b74f0f50cb6a88b6e7c12179
  F src/table.c e7a09215315a978057fb42c640f890160dbcc45e
 -F src/tclsqlite.c fa72a7c5278662357c105ba7925c1d0972506ff9
 +F src/tclsqlite.c 796b427293e8f0e2769d3956c23df66880fe5535
  F src/test1.c 90fbedce75330d48d99eadb7d5f4223e86969585
  F src/test2.c 577961fe48961b2f2e5c8b56ee50c3f459d3359d
  F src/test3.c 64d2afdd68feac1bb5e2ffb8226c8c639f798622
@@@ -1231,9 -1214,9 +1233,9 @@@ F tool/mkkeywordhash.c dfff09dbbfaf950e
  F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e
  F tool/mkpragmatab.tcl 94f196c9961e0ca3513e29f57125a3197808be2d
  F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
- F tool/mksqlite3c-noext.tcl 9ef48e1748dce7b844f67e2450ff9dfeb0fb4ab5
- F tool/mksqlite3c.tcl e885509e1a95e6468b734ca5c2b5886248758a3c
- F tool/mksqlite3h.tcl ba24038056f51fde07c0079c41885ab85e2cff12
+ F tool/mksqlite3c-noext.tcl 69bae8ce4aa52d2ff82d4a8a856bf283ec035b2e
 -F tool/mksqlite3c.tcl 52a3352f7aa15f1db851e45ac3a5e2173d6fe93c
++F tool/mksqlite3c.tcl 9f664f73301ad91ab8ff8886f35152293c564b17
+ F tool/mksqlite3h.tcl 44730d586c9031638cdd2eb443b801c0d2dbd9f8
  F tool/mksqlite3internalh.tcl eb994013e833359137eb53a55acdad0b5ae1049b
  F tool/mkvsix.tcl 52a4c613707ac34ae9c226e5ccc69cb948556105
  F tool/offsets.c fe4262fdfa378e8f5499a42136d17bf3b98f6091
@@@ -1265,7 -1249,10 +1268,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 9d9b6c883b4f7d69c615cedfb59a2385aac47b74
- R 563e539a9aa7beed43e32c4d3d14e4ca
- U dan
- Z d4cd9fd543e406f0ec30b86742c8ca7d
 -P 8e4ac2ce24415926247961b00a62425ae85d6ffb
 -R 5875861747bb686954783d9ce4259b86
 -T +bgcolor * #d0c0ff
 -T +sym-release *
 -T +sym-version-3.8.9 *
++P 4e8796af7d40d6ca423e07c68877035e4aa2485c 8a8ffc862e96f57aa698f93de10dee28e69f6e09
++R 5f5852d5f7f1cc470ab35b77b2f9115f
+ U drh
 -Z 05045ab8d5dbbaefca88cc23b8dca09c
++Z 0c6fb869959322b1de7ded76db4a0dc3

diff --cc manifest.uuid
index 21a3d0a7f5e0679077c041579ff2b879b82558e0,a38b33773ef2be90729e6db5c4958c985f9f6164..6f06cede7777c6f414fdd078096b84992bd5fa49
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 4e8796af7d40d6ca423e07c68877035e4aa2485c
 -8a8ffc862e96f57aa698f93de10dee28e69f6e09
++ec9d907a57fcea72c8a64e521e8a1b5777d67568

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

diff --cc tool/mksqlite3c.tcl
index 1dae70818dd2eab8387d47e7c8ad812148c73e75,136155089ca5a335e5eccc2cf4a04a9ec412ce77..f9d1fb0fdb49605236a9a647a64b87e7b53b482d
--- 1/tool/mksqlite3c.tcl
--- 2/tool/mksqlite3c.tcl
+++ b/tool/mksqlite3c.tcl
@@@ -192,12 -205,26 +206,26 @@@ proc copy_file {filename} 
      } elseif {!$linemacros && [regexp {^#line} $line]} {
        # Skip #line directives.
      } elseif {$addstatic && ![regexp {^(static|typedef)} $line]} {
-       regsub {^SQLITE_API } $line {} line
-       if {[regexp $declpattern $line all funcname]} {
+       # Skip adding the SQLITE_PRIVATE or SQLITE_API keyword before
+       # functions if this header file does not need it.
+       if {![info exists varonly_hdr($tail)]
+        && [regexp $declpattern $line all rettype funcname rest]} {
+         regsub {^SQLITE_API } $line {} line
          # Add the SQLITE_PRIVATE or SQLITE_API keyword before functions.
          # so that linkage can be modified at compile-time.
 -        if {[regexp {^sqlite3_} $funcname]} {
 +        if {[regexp {^sqlite3(_|ota_)} $funcname]} {
-           puts $out "SQLITE_API $line"
+           set line SQLITE_API
+           append line " " [string trim $rettype]
+           if {[string index $rettype end] ne "*"} {
+             append line " "
+           }
+           if {[lsearch -exact $cdecllist $funcname] >= 0} {
+             append line SQLITE_CDECL
+           } else {
+             append line SQLITE_STDCALL
+           }
+           append line " " $funcname $rest
+           puts $out $line
          } else {
            puts $out "SQLITE_PRIVATE $line"
          }