From: drh <drh@noemail.net>
Date: Mon, 15 Feb 2016 17:44:45 +0000 (+0000)
Subject: Merge version 3.11.0
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=93f88ebbb167cf8eb64569bde9ae610690fe805b;p=thirdparty%2Fsqlite.git

Merge version 3.11.0

FossilOrigin-Name: c393ddc71a041a711f8eaa6fbd75371309df5602
---

93f88ebbb167cf8eb64569bde9ae610690fe805b
diff --cc manifest
index 00f3c9ec42,a33ec564a2..5f653c9660
--- a/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C Merge\sPRAGMA\ssynchronous=EXTRA\sand\sOOM\sperformance\senhancements\sfrom\strunk.
- D 2016-02-05T14:34:51.522
- F Makefile.in 027c1603f255390c43a426671055a31c0a65fdb4
 -C Version\s3.11.0
 -D 2016-02-15T17:29:24.141
++C Merge\sversion\s3.11.0
++D 2016-02-15T17:44:45.399
+ F Makefile.in 4e90dc1521879022aa9479268a4cd141d1771142
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc 72b7858f02017611c3ac1ddc965251017fed0845
+ F Makefile.msc 30f075dc4f27a07abb76088946b2944178d85347
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION 866588d1edf0ccb5b0d33896974338f97564f719
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -291,10 -291,10 +291,10 @@@ F src/auth.c b56c78ebe40a2110fd361379f7
  F src/backup.c 2869a76c03eb393ee795416e2387005553df72bc
  F src/bitvec.c 1a78d450a17c5016710eec900bedfc5729bf9bdf
  F src/btmutex.c bc87dd3b062cc26edfe79918de2200ccb8d41e73
- F src/btree.c deead36f1ee76e27f0692a9aa8fb698e90e063b4
 -F src/btree.c 4c8caaeed7878aafdb607c3d2bcbc365bb0d19a1
 -F src/btree.h 368ceeb4bd9312dc8df2ffd64b4b7dbcf4db5f8e
 -F src/btreeInt.h c18b7d2a3494695133e4e60ee36061d37f45d9a5
 -F src/build.c 54866fbafa09d494269bdefc79995eb7207003a6
++F src/btree.c 2cca792e04bda429d4ecf873b1a777141aa25c18
 +F src/btree.h 3c4f3fc066071991907e19ccf3fac5ac4a36bfc1
 +F src/btreeInt.h ca40607c2c9d4b4b7ded98e3d707b15c2f17f1bf
- F src/build.c a9955bb322ce24b965c20f91b99ec1c5d7fc5d02
++F src/build.c 88ec1b5da653719c825e67bb643ecb7d9216b502
  F src/callback.c ed6c2a4a712eb7287ff64e20e3c23265dfb8a7ce
  F src/complete.c addcd8160b081131005d5bc2d34adf20c1c5c92f
  F src/ctime.c 60e135af364d777a9ab41c97e5e89cd224da6198
@@@ -348,12 -348,12 +348,12 @@@ F src/printf.c 63e6fb12bbe702dd664dc370
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
  F src/resolve.c 9f7ce3a3c087afb7597b7c916c99126ff3f12f0c
  F src/rowset.c 9fe4b3ad7cc00944386bb600233d8f523de07a6e
- F src/select.c 57646a44ba9a0bc4aa926ae9c79b8199c246844b
- F src/shell.c dcd7a83645ef2a58ee9c6d0ea4714d877d7835c4
- F src/sqlite.h.in cf22ad1d52dca2c9862d63833e581028119aab7e
+ F src/select.c ff80004a9a6ece891a8d9327a88e7b6e2588ee6d
+ F src/shell.c 0367440658104bf2ce8d8a9a5a713a4b11c9acbe
+ F src/sqlite.h.in f80c6ebd85588fc514bfedf3ecb00cec269cb410
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h dfbe62ffd95b99afe2140d8c35b180d11924072d
- F src/sqliteInt.h 19ed64cd3dc0d26ac581d8f5ff8944814cd601d8
 -F src/sqliteInt.h 04ca5b3cdb3bcf87ba6300d5d36b51498f65f28c
++F src/sqliteInt.h 125f2cbdf7b391b321efa2522a5dfbd2a12180ea
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba
  F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
@@@ -372,7 -372,7 +372,7 @@@ F src/test_autoext.c dea8a01a7153b9adc9
  F src/test_backup.c 2e6e6a081870150f20c526a2e9d0d29cda47d803
  F src/test_blob.c e5a7a81d61a780da79101aeb1e60d300af169e07
  F src/test_btree.c 2e9978eca99a9a4bfa8cae949efb00886860a64f
- F src/test_config.c cd88b616e98347bc6bbe84918ae3f4b8c1267590
 -F src/test_config.c 7985332c806d1cece793475c75a6abcccde9d331
++F src/test_config.c 3e8a3b5c307a454cd3b7d1c41a39d66988f06f3a
  F src/test_demovfs.c 0de72c2c89551629f58486fde5734b7d90758852
  F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
  F src/test_fs.c a61f54247fdb843761d709879c3bcd1989b2050c
@@@ -406,28 -406,28 +406,28 @@@ F src/test_windirent.c 8f5fada630348558
  F src/test_windirent.h b12055cab6227f7be10f5c19296f67c60cc5e2a5
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/threads.c bbfb74450643cb5372a43ad4f6cffd7e9dfcecb0
- F src/tokenize.c 214b783d6138e9f9fbb6b225ce9a376db3b03d42
+ F src/tokenize.c 813934be70597edfbb685ae08fc4c8b549cf5a1e
  F src/treeview.c dc39ccf04e9331237388b9cb73289c9d87ea050b
  F src/trigger.c e14840ee0c3e549e758ec9bf3e4146e166002280
- F src/update.c 310ca7adb86a7d1f2afae46905b21c83580f3e17
+ F src/update.c a7eeeaffad59c6506f01303a071dac11de8269ca
  F src/utf.c 10cc2519e82e3369344d0969ad4b1a333dc86d18
  F src/util.c 49ce0a65306c1c51d61cb5bc214c71cb62452de6
 -F src/vacuum.c 2ddd5cad2a7b9cef7f9e431b8c7771634c6b1701
 -F src/vdbe.c c193299e595a13eba247738e22fce25c49346a6c
 +F src/vacuum.c 983cc3754718ef169a6ea9aef86798bd28106f21
 +F src/vdbe.c 642df098ce2ad75212a26c50f3e90aeb28bb6421
- F src/vdbe.h 7a733ea8aac1b77305a67698e784fa3484ee3337
+ F src/vdbe.h c743791f723049db94f009e3e30958952bc2d512
  F src/vdbeInt.h 4b69d5451bcadd473e745af53ef1e8abfdce0a79
  F src/vdbeapi.c 9324f6baee1a1b2284c6543e98f916888a81e459
- F src/vdbeaux.c 4f40ac1568f23c912f9d9ea85819d27485d8d572
 -F src/vdbeaux.c deae5d3bd45da0e57c7d9e1d7436333d142dc3bb
++F src/vdbeaux.c 7a77e8be791e36d6c2440f60ebf81329d310c77d
  F src/vdbeblob.c 3b570b730109e8f653d9d2081649f6e7015113db
  F src/vdbemem.c 68fcfac37dc6601d98c32cc5adee4d39f2c1b7b4
  F src/vdbesort.c ef3c6d1f1a7d44cf67bb2bee59ea3d1fe5bad174
  F src/vdbetrace.c f75c5455d8cf389ef86a8bfdfd3177e0e3692484
  F src/vtab.c bef51b4f693d82b4b0184457faa8625654534091
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
- F src/wal.c 2390cb2e5cc8529ab4dee92ee8292db1a4f824d8
 -F src/wal.c 1dd3f1aeed5765be62f27d7d2e44d46a68d891ab
 -F src/wal.h 2f7c831cf3b071fa548bf2d5cac640846a7ff19c
++F src/wal.c 68eb8a4a280680fab05715dda90af50709e1dcb2
 +F src/wal.h 327e94c3e366154f52a8d9be9be0ea790cc4e08c
  F src/walker.c 0f142b5bd3ed2041fc52d773880748b212e63354
- F src/where.c d89fd5cff448ab5c5ca492dd9793b35ffe31ab35
+ F src/where.c 984084584c10c41e46c89ac027a5cca991bc37e6
  F src/whereInt.h 78b6b4de94db84aecbdc07fe3e38f648eb391e9a
  F src/wherecode.c 791a784bbf8749d560fdb0b990b607bc4f44a38d
  F src/whereexpr.c de117970b29471177a6901d60ad83a194671dc03
@@@ -1298,9 -1295,9 +1298,9 @@@ F test/vtabH.test 5f5157a1501d9889ec35c
  F test/vtabI.test 751b07636700dbdea328e4265b6077ccd6811a3f
  F test/vtab_alter.test 9e374885248f69e251bdaacf480b04a197f125e5
  F test/vtab_err.test 0d4d8eb4def1d053ac7c5050df3024fd47a3fbd8
- F test/vtab_shared.test ea8778d5b0df200adef2ca7c00c3c37d4375f772
+ F test/vtab_shared.test 5253bff2355a9a3f014c15337da7e177ab0ef8ad
  F test/wal.test 0148c8b3421a25fdb4d9c160e84a681d0646371b
 -F test/wal2.test 1f841d2048080d32f552942e333fd99ce541dada
 +F test/wal2.test dc801f6d3f8f39d1534ffbd15a715b0b287508db
  F test/wal3.test 5dd734147f1f8f958c5261a1f2775d346d7013ce
  F test/wal4.test 4744e155cd6299c6bd99d3eab1c82f77db9cdb3c
  F test/wal5.test 88b5d9a6a3d1532497ee9f4296f010d66f07e33c
@@@ -1385,8 -1382,8 +1385,8 @@@ F tool/lemon.c 799e73e19a33b8dd7767a7fa
  F tool/lempar.c 3ec1463a034b37d87d782be5f6b8b10a3b1ecbe7
  F tool/loadfts.c c3c64e4d5e90e8ba41159232c2189dba4be7b862
  F tool/logest.c eef612f8adf4d0993dafed0416064cf50d5d33c6
- F tool/mkautoconfamal.sh a29b14d54302b33fd892958f6895582ea90e4a45
- F tool/mkkeywordhash.c 24c1fb16c51f4f72c9027230ff575c47b6d3b828
+ F tool/mkautoconfamal.sh c78caa3214f25dc28ea157b5a82abb311f209906
 -F tool/mkkeywordhash.c f7f3b342211ac6a14258b9726d5b97cf4f548f22
++F tool/mkkeywordhash.c f5ecfd09b56b8badc644554ed38c86056152b893
  F tool/mkmsvcmin.tcl d57e6efc9428605f5418d0b235721ddf7b5d9c0b
  F tool/mkopcodec.tcl d1b6362bd3aa80d5520d4d6f3765badf01f6c43c
  F tool/mkopcodeh.tcl 385c62d78c38b2d92146dcb5abd319dbbc33506d
@@@ -1427,9 -1425,12 +1428,9 @@@ F tool/varint.c 5d94cb5003db9dbbcbcc5df
  F tool/vdbe-compress.tcl 5926c71f9c12d2ab73ef35c29376e756eb68361c
  F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
- F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
+ F tool/warnings.sh ef6ebc6fd8d2dc35db3b622015c16a023d4fef4f
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 347f6a80c2aa6dde9b58d28069156db22cd21b6d b082538da774ac77f284fd7e22f9b1b9c2abc343
- R 4cd198f14afb8c9af6f5ad3deaf0e2fa
 -P f694e60a79024967a3f4574e3928f0b28589d381
 -R f2e9debe8cf42a0179962a66a44645cf
 -T +bgcolor * #d0c0ff
 -T +sym-release *
 -T +sym-version-3.11.0 *
++P 332c8036ca8a97087ced210e322c8a91be2a9036 3d862f207e3adc00f78066799ac5a8c282430a5f
++R 9f4b18ab870754b66439546da1781522
  U drh
- Z a399e68e9652b366ee9d0d44100d189b
 -Z e719a8e2c047e401006dde85de2084bf
++Z 52763a5aa163700843aa5557e6ee950b
diff --cc manifest.uuid
index 948d9e016e,474c1210cb..821734f87f
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 332c8036ca8a97087ced210e322c8a91be2a9036
 -3d862f207e3adc00f78066799ac5a8c282430a5f
++c393ddc71a041a711f8eaa6fbd75371309df5602