From: drh <drh@noemail.net>
Date: Mon, 15 Oct 2012 14:25:16 +0000 (+0000)
Subject: Merge all the latest core changes into the sessions branch.
X-Git-Tag: version-3.13.0~148^2~224
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=036a71a97c34935221e49e8d0658702656599f1e;p=thirdparty%2Fsqlite.git

Merge all the latest core changes into the sessions branch.

FossilOrigin-Name: 76767d651fe733614b1719aef9ad5ed4568234e4
---

036a71a97c34935221e49e8d0658702656599f1e
diff --cc manifest
index 72157a1697,0c609fcf26..dd60773dd1
--- a/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\sthe\slatest\strunk\schanges,\sespecially\sthe\sORDER\sBY\soptimizer\senhancements\nbut\salso\sother\sfixes,\sonto\sthe\ssessions\sbranch.
- D 2012-10-09T14:58:15.175
 -C Fix\sa\sfailing\sassert()\sin\swal.c.
 -D 2012-10-15T11:28:24.947
++C Merge\sall\sthe\slatest\score\schanges\sinto\sthe\ssessions\sbranch.
++D 2012-10-15T14:25:16.488
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 5f4f26109f9d80829122e0e09f9cda008fa065fb
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc a26021086defb54e6cb61439a90be5960b713017
 -F Makefile.msc 1d8a5d3cf33b8b8d3247c99367a37af384cc7ebd
++F Makefile.msc eeacc62cbb02aa3ef6a5c8bdb5d4e6a70f5ca5b2
  F Makefile.vxworks b18ad88e9a8c6a001f5cf4a389116a4f1a7ab45f
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
  F VERSION edab4af5a4623f8198833ea481ce98ab53750a8d
@@@ -150,12 -138,12 +150,12 @@@ F src/global.c fb44b11e02e06c995e6ed664
  F src/hash.c a4031441741932da9e7a65bee2b36b5d0e81c073
  F src/hash.h 2894c932d84d9f892d4b4023a75e501f83050970
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
 -F src/insert.c ad0d8943d2a4f0b52ebf75b9e459f2da00117dbd
 +F src/insert.c 6273647b67e27e3f81b7d1fd144307ea726841d0
  F src/journal.c 552839e54d1bf76fb8f7abe51868b66acacf6a0e
  F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f
- F src/lempar.c 0ee69fca0be54cd93939df98d2aca4ca46f44416
+ F src/lempar.c cdf0a000315332fc9b50b62f3b5e22e080a0952b
  F src/loadext.c f20382fbaeec832438a1ba7797bee3d3c8a6d51d
 -F src/main.c ca6784455f3207524b82d24141676d641d44f137
 +F src/main.c 5cee8048dde78b2b47f5c2090cbb31b10d190673
  F src/malloc.c fe085aa851b666b7c375c1ff957643dc20a04bf6
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 437c7c4af964895d4650f29881df63535caaa1fa
@@@ -188,10 -176,10 +188,10 @@@ F src/resolve.c 7b986a715ac281643309c29
  F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
  F src/select.c 2a82736faeca1fe93315eda20c691d68ec13bb6c
  F src/shell.c 8ee5a3cb502e2d574f97b43972e6c1e275e7bec7
 -F src/sqlite.h.in c7be05ad191d2634292fcc77bdb2bcfa4526eb98
 +F src/sqlite.h.in d460ae07ecdd1c820272d9c217547c7b572cb4b7
  F src/sqlite3.rc fea433eb0a59f4c9393c8e6d76a6e2596b1fe0c0
  F src/sqlite3ext.h 6904f4aadf976f95241311fbffb00823075d9477
- F src/sqliteInt.h fec16c0932b30aedf5d3b577aaf5f881589c8dd0
 -F src/sqliteInt.h b49674b1c92173e9796c94fd6f15c1679e3b10cc
++F src/sqliteInt.h c00feec4f6debb1cb4bad802d2c7fe5050e744ca
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 35939e7e03abf1b7577ce311f48f682c40de3208
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -1032,7 -1021,7 +1034,7 @@@ F tool/vdbe-compress.tcl f12c884766bd14
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
  F tool/win/sqlite.vsix 67d8a99aceb56384a81b3f30d6c71743146d2cc9
- P 6ca8eae1f89d19ee23cbc3a869d85b57d29b4a7d a02599ad85d02470c9effa51c02dbda7796bfa16
- R 05272e22ec105aad09507c576198ab3e
 -P ca86138bda26c5ac5a7e67351acbd19fbd39b0ae
 -R 1adb0472104019713641ff3149a537e4
 -U dan
 -Z 82a77f3539e233996c3bcae559658f67
++P f1fbb8c5bfa84e84e0b8e2872d83b06a0c0d5acc 8745530b9a877db77fe2ca3ea9c6bc99ce033055
++R 2fad70ce160d67d476b8ae23c3ce13a3
 +U drh
- Z 8b270f262a5da1e0ba6e8c7b897dd596
++Z 004a84637f514b12189e7dcddda1b18b
diff --cc manifest.uuid
index f368e5856b,96923ec6e5..669e24dd0d
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- f1fbb8c5bfa84e84e0b8e2872d83b06a0c0d5acc
 -8745530b9a877db77fe2ca3ea9c6bc99ce033055
++76767d651fe733614b1719aef9ad5ed4568234e4