From: drh <drh@noemail.net>
Date: Wed, 6 Jan 2016 14:35:15 +0000 (+0000)
Subject: Merge all version 3.10.0 updates.
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6a09a46b10de6efd54e5652967bc95bfdfb9cbae;p=thirdparty%2Fsqlite.git

Merge all version 3.10.0 updates.

FossilOrigin-Name: 77c28c2b2dc601e67a88f55afff53b6cb9a24833
---

6a09a46b10de6efd54e5652967bc95bfdfb9cbae
diff --cc manifest
index ae3e8f753b,84ab4c9e57..175a5113a9
--- a/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C Merge\sall\srecent\strunk\senhancements.
- D 2016-01-01T13:31:36.005
- F Makefile.in 2b14d1b2c0d8b4c6fd84536d3d7860e1ddc03efc
 -C Version\s3.10.0
 -D 2016-01-06T11:01:07.739
 -F Makefile.in 7c8cc4c2f0179efc6fa9492141d1fb65f4807054
++C Merge\sall\sversion\s3.10.0\supdates.
++D 2016-01-06T14:35:15.686
++F Makefile.in 7b85d6e4ef59420a075d21525a58b69a97e554f1
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc 5fff077fcc46de7714ed6eebb6159a4c00eab751
+ F Makefile.msc e45d8b9b56dfa3f2cd860b2c28bd9d304513b042
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION 8b9d3ac6f1962f94e06ba05462422a544f9c4e36
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -260,7 -257,7 +260,7 @@@ F ext/userauth/userauth.c 5fa3bdb492f48
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk 2f7ba9f9e044ecfa95eb0a446eebe1b37a6b565a
 -F main.mk 20e46c09ac8732a74a9e2d55e8d90257d97eb844
++F main.mk 95cf55a591539be53fd52e2856d83ddddfad9681
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@@ -279,10 -276,10 +279,10 @@@ F src/auth.c b56c78ebe40a2110fd361379f7
  F src/backup.c 2869a76c03eb393ee795416e2387005553df72bc
  F src/bitvec.c 1a78d450a17c5016710eec900bedfc5729bf9bdf
  F src/btmutex.c 45a968cc85afed9b5e6cf55bf1f42f8d18107f79
 -F src/btree.c 4d3452b2a3daf875490ac4f0a278da7f85fabe12
 +F src/btree.c c24afbe7c9e4a3e8279d91680d9e9602588db488
  F src/btree.h 2d76dee44704c47eed323356a758662724b674a0
  F src/btreeInt.h b5f2651b41808f038dee9282c5dc0232ce6532d3
- F src/build.c 1c9fb552148ee8f9234435a38833f8fca2081a71
+ F src/build.c d8006e9030c61b9495d0b2f724edd3fcdae16930
  F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0
  F src/complete.c addcd8160b081131005d5bc2d34adf20c1c5c92f
  F src/ctime.c 60e135af364d777a9ab41c97e5e89cd224da6198
@@@ -337,12 -334,11 +337,12 @@@ F src/random.c ba2679f80ec82c4190062d75
  F src/resolve.c a83b41104e6ff69855d03cd0aaa09e93927ec39f
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
  F src/select.c f8fded11fc443a9f5a73cc5db069d06b34460e2f
- F src/shell.c 8d152e833c3b79825978deb83175234749c5cdf3
+ F src/shell.c ed71dc7679e6f087a3f1ea3f9dae4b0fae7209c3
 -F src/sqlite.h.in 7d87d71b9a4689c51fa092f48f16590ff71558e3
 +F src/sqlite.h.in 52db0e5240e6c3d355937cdc187b61999d884aff
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1
  F src/sqlite3ext.h dfbe62ffd95b99afe2140d8c35b180d11924072d
- F src/sqliteInt.h 35e07d7cff4693ebaa5c43d2365ea1f1bc68e5c4
 -F src/sqliteInt.h f97614d43833bae0ed6c51ac8e550f0099a1d0ba
++F src/sqliteInt.h 3b529e6a3771cce0f840b7a411ddb04761d96798
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba
  F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
@@@ -361,10 -357,10 +361,10 @@@ 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 0dee90328e3dedf8ba002ee94b6a7e7ea7726fe4
 +F src/test_config.c f569bb9c62cb98ffc7968d7f557703197fb4027e
  F src/test_demovfs.c 0de72c2c89551629f58486fde5734b7d90758852
  F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
- F src/test_fs.c 993c7eab65bed6add4bb48cca29775e963f710cf
+ F src/test_fs.c a61f54247fdb843761d709879c3bcd1989b2050c
  F src/test_func.c 0d9c25956152adefee8881c6fadc8354793764d0
  F src/test_hexio.c abfdecb6fa58c354623978efceb088ca18e379cd
  F src/test_init.c 66b33120ffe9cd853b5a905ec850d51151337b32
@@@ -402,11 -398,11 +402,11 @@@ F src/update.c 17332f9fe818cbc0444c36a8
  F src/utf.c 32d7f82aa921322f3e1c956f4b58f019ebd2c6b3
  F src/util.c e802e8e311a0d6c48cd1b3e89db164f6f0248d70
  F src/vacuum.c 2ddd5cad2a7b9cef7f9e431b8c7771634c6b1701
- F src/vdbe.c a01c8ccdb4a90aaabfc126c2debf5cc9f420d0c9
 -F src/vdbe.c 6ac8e5d808d48afc369316e147c191102f0584c1
++F src/vdbe.c 5678e9375dca62a33726c7565e2e61ce701ea365
  F src/vdbe.h efb7a8c1459e31f3ea4377824c6a7e4cb5068637
  F src/vdbeInt.h 75c2e82ee3357e9210c06474f8d9bdf12c81105d
 -F src/vdbeapi.c 020681b943e77766b32ae1cddf86d7831b7374ca
 -F src/vdbeaux.c 3308a07a6b0b64e22e83cbcc76773eaf330b056a
 +F src/vdbeapi.c b13f483b1375467c367de486edf2be05234e27bb
- F src/vdbeaux.c 41d3493139900b3f74d570f6406c7d1888202d35
++F src/vdbeaux.c 8e542577cea8be74d4fb2a11ee6d6248e12cb4c4
  F src/vdbeblob.c fdc4a81605ae7a35ae94a55bd768b66d6be16f15
  F src/vdbemem.c fdd1578e47bea61390d472de53c565781d81e045
  F src/vdbesort.c a7ec02da4494c59dfd071126dd3726be5a11459d
@@@ -566,10 -562,10 +566,10 @@@ F test/crashtest1.c 09c1c7d728ccf4feb9e
  F test/createtab.test b5de160630b209c4b8925bdcbbaf48cc90b67fe8
  F test/cse.test 277350a26264495e86b1785f34d2d0c8600e021c
  F test/ctime.test 7bd009071e242aac4f18521581536b652b789a47
- F test/cursorhint.test 432811b62bd5ffb812729f49bba3b9ad687550bb
+ F test/cursorhint.test 7bc346788390475e77a345da2b92270d04d35856
  F test/date.test 984ac1e3e5e031386866f034006148d3972b4a65
  F test/dbstatus.test 8de104bb5606f19537d23cd553b41349b5ab1204
 -F test/dbstatus2.test 10418e62b3db5dca070f0c3eef3ea13946f339c2
 +F test/dbstatus2.test fc968d3005b4d827eba807a06573a6c528aa119a
  F test/default.test 0cb49b1c315a0d81c81d775e407f66906a2a604d
  F test/delete.test e1bcdf8926234e27aac24b346ad83d3329ec8b6f
  F test/delete2.test 3a03f2cca1f9a67ec469915cb8babd6485db43fa
@@@ -1411,7 -1406,10 +1411,7 @@@ F tool/vdbe_profile.tcl 246d0da094856d7
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 7e7b24064510001ca4a0c8295fa7d0138bde8dae 68360cd2211b7ab25dd4ca55a2e82e31f51f2976
- R 301360c61d3e627f628a10e0fd167e91
 -P a855697719e288c908ddb7950d32fd17ef546509
 -R 658872c8eaad4f517adfb9642371bf29
 -T +bgcolor * #d0c0ff
 -T +sym-release *
 -T +sym-version-3.10.0 *
++P 5b700f313d753a308d2c6b5e5a5ee42af2e6d180 fd0a50f0797d154fefff724624f00548b5320566
++R 917b6555389a1f5facbdef20b023e669
  U drh
- Z a5d1b5d07c798b4bf7e432435ffb7ccc
 -Z 024a1b2bbd235a427c0ebcd39a99300a
++Z a788d0588b62e2dbe90c7ae8199f5804
diff --cc manifest.uuid
index 88c9302ee6,01d9768cad..4efd5d194b
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 5b700f313d753a308d2c6b5e5a5ee42af2e6d180
 -fd0a50f0797d154fefff724624f00548b5320566
++77c28c2b2dc601e67a88f55afff53b6cb9a24833
diff --cc src/vdbeaux.c
index 3fdcfd5008,dbbb2a6ccb..b7d4e280d3
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@@ -1858,12 -1869,8 +1869,10 @@@ void sqlite3VdbeMakeReady
    if( pParse->explain && nMem<10 ){
      nMem = 10;
    }
-   memset(zCsr, 0, nFree);
-   assert( EIGHT_BYTE_ALIGNMENT(&zCsr[nFree]) );
    p->expired = 0;
  
 +  p->expired = 0;
 +  
    /* Memory for registers, parameters, cursor, etc, is allocated in two
    ** passes.  On the first pass, we try to reuse unused space at the 
    ** end of the opcode array.  If we are unable to satisfy all memory