From: drh <drh@noemail.net>
Date: Thu, 4 Oct 2012 22:45:58 +0000 (+0000)
Subject: Merge the 3.7.14.1 release including the fix for the LEFT JOIN problem into
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fheads%2Fsessions-3.7.14;p=thirdparty%2Fsqlite.git

Merge the 3.7.14.1 release including the fix for the LEFT JOIN problem into
the sessions branch.

FossilOrigin-Name: 17644c0e33f3d9e144b873806e9530cc2db274ee
---

a9ef8d81c857cb9f6eb3d057ffab4dc69704ab57
diff --cc manifest
index 44e26200ec,6cd0a460ac..69ab6e83f1
--- a/manifest
+++ b/manifest
@@@ -1,12 -1,12 +1,12 @@@
- C Work\saround\san\soptimization\sissue\swith\sthe\sMSVC\scompiler\sfor\sARM.
- D 2012-10-03T18:26:39.323
 -C Version\s3.7.14.1
 -D 2012-10-04T19:37:12.994
++C Merge\sthe\s3.7.14.1\srelease\sincluding\sthe\sfix\sfor\sthe\sLEFT\sJOIN\sproblem\sinto\nthe\ssessions\sbranch.
++D 2012-10-04T22:45:58.218
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in abd5c10d21d1395f140d9e50ea999df8fa4d6376
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc 2d696f01c228995e98b3b953a08b7bba1d48c130
 +F Makefile.msc 2f3680c29a53135c2b45a5c9c5c5ee860ed1a34c
  F Makefile.vxworks 879f034a64062a364b21000266bbd5bc6e0c19b9
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
- F VERSION a71848df48082f1d6585d4b0819d530fc455485d
+ F VERSION 9694dff497fc7e53037a5890f30ab069c26e8ab7
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F addopcodes.awk 17dc593f791f874d2c23a0f9360850ded0286531
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
@@@ -197,7 -185,7 +197,7 @@@ F src/sqliteInt.h 569cb02b6555db22dbe38
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 35939e7e03abf1b7577ce311f48f682c40de3208
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
- F src/tclsqlite.c e4feb5698ee09f8b32ee40baa1d3577871125042
 -F src/tclsqlite.c d20022c647aa7a871d7b4038c4ec971cafe39744
++F src/tclsqlite.c 55b8c6fad0cac37a3472d7db1272ad1c9b4a244a
  F src/test1.c 3d70f7c5987f186884cfebbfa7151a7d3d67d86e
  F src/test2.c 4178056dd1e7d70f954ad8a1e3edb71a2a784daf
  F src/test3.c 3c3c2407fa6ec7a19e24ae23f7cb439d0275a60d
@@@ -747,7 -734,7 +747,7 @@@ F test/syscall.test bea9bf329bff733c791
  F test/sysfault.test c79441d88d23696fbec7b147dba98d42a04f523f
  F test/table.test a59d985ca366e39b17b175f387f9d5db5a18d4e2
  F test/tableapi.test 2674633fa95d80da917571ebdd759a14d9819126
- F test/tclsqlite.test 2f2aa887763af30641f5561bdc26c5d3fbc73a88
 -F test/tclsqlite.test 952b772830bd380c9b5f58c03fb374189be53828
++F test/tclsqlite.test 2052ca66640b14d33b8e17f3a24b946cddfb0ec2
  F test/tempdb.test 19d0f66e2e3eeffd68661a11c83ba5e6ace9128c
  F test/temptable.test 51edd31c65ed1560dd600b1796e8325df96318e2
  F test/temptrigger.test 26670ed7a39cf2296a7f0a9e0a1d7bdb7abe936d
@@@ -1027,7 -1014,10 +1027,7 @@@ F tool/vdbe-compress.tcl d70ea6d8a19e35
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
  F tool/win/sqlite.vsix 67d8a99aceb56384a81b3f30d6c71743146d2cc9
- P 86633e01fec2cbc00c749f6ef6ecda6acad2a82e
- R e98c79d5113be3b6fac2b737f0b78828
 -P 81fd941da62956e32d1c4ffcdb39abecba7a6f3b
 -R a82bf185a73888ab1f23d02429bade9e
 -T +bgcolor * #d0c0ff
 -T +sym-release *
 -T +sym-version-3.7.14.1 *
++P 2ce625fdbee78b2acbe3aa19b01ff92241c0d598 091570e46d04e84b67228e0bdbcd6e1fb60c6bdb
++R 05bcb07e9ac288a81b251a2d7eae2e18
  U drh
- Z 583a5f488427cc9879b99281d52c2986
 -Z 002ec98f7f5b76deaac3a726393245f3
++Z 261201057227005a81c4f41c6b14168e
diff --cc manifest.uuid
index 8d28855609,e9782c2f27..dffef25e2d
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 2ce625fdbee78b2acbe3aa19b01ff92241c0d598
 -091570e46d04e84b67228e0bdbcd6e1fb60c6bdb
++17644c0e33f3d9e144b873806e9530cc2db274ee