Merge all the latest trunk changes into the sessions branch.

FossilOrigin-Name: d69d21903b883067c66dbcdefe6b369a6fe328b0

diff --cc manifest
index 80c82b8ffbdb8d45c72e7228e7fba5f3ad886ca1,aacba4cf117a5e9e332093fdd80ae36a7b3fef31..b0f2690b3b0d55c743db7477699fef46b3ba5a11
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Enhancements\sto\sthe\squery\splanner\sto\smake\suse\sof\sindices\sfor\sORDER\sBY\seven\nwhen\sIN\sconstraints\sare\sin\sthe\sWHERE\sclause.\s\sAdd\sextended\serror\scodes\sfor\nall\sSQLITE_CONSTRAINT\serrors.
- D 2013-02-13T13:42:50.179
 -C Fix\sa\sbug\s(ticket\s[fc7bd6358f59])\sthat\scaused\sincorrect\squery\sresults\sin\nthree\sway\squeries\sthat\sinvolved\scomparing\sINTEGER\sand\sTEXT\scolumns\sfor\nequality.
 -D 2013-03-06T01:55:27.319
++C Merge\sall\sthe\slatest\strunk\schanges\sinto\sthe\ssessions\sbranch.
++D 2013-03-06T02:12:18.694
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in a48faa9e7dd7d556d84f5456eabe5825dd8a6282
+ F Makefile.in 9a804abbd3cae82d196e4d33aba13239e32522a5
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc 1bed3bca025ee90441bb0c9f95f36f42b70bd839
 +F Makefile.msc 5de508f802789aae3e96d86261c5cf633d67ce00
  F Makefile.vxworks b18ad88e9a8c6a001f5cf4a389116a4f1a7ab45f
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
  F VERSION 6d4f66eaebabc42ef8c2a4d2d0caf4ce7ee81137
@@@ -141,11 -129,11 +141,11 @@@ F src/callback.c d7e46f40c3cf53c43550b7
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
  F src/ctime.c 72a70dcfda75d3a1f81041ce4573e7afddcd8e4e
  F src/date.c 067a81c9942c497aafd2c260e13add8a7d0c7dd4
 -F src/delete.c 9b8d308979114991e5dc7cee958316e07186941d
 +F src/delete.c 9bc9463952bdc9fc43111b1f9c83a0af9b8e2239
- F src/expr.c f6c20285bd36e87ec47f4d840e90a32755e2a90c
+ F src/expr.c a23b4aac2a455b2e76b55bef5dcfbe62b665375c
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c e16942bd5c8a868ac53287886464a5ed0e72b179
- F src/func.c 8147799b048065a1590805be464d05b4913e652c
+ F src/func.c 91bc65eb68ef6cf29198aac92f11489fa85a8de4
  F src/global.c e59ecd2c553ad0d4bfbc84ca71231336f8993a7a
  F src/hash.c ac3470bbf1ca4ae4e306a8ecb0fdf1731810ffe4
  F src/hash.h 2894c932d84d9f892d4b4023a75e501f83050970
@@@ -154,8 -142,8 +154,8 @@@ F src/insert.c 02f8a1867088cb654eb756f9
  F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
  F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f
  F src/lempar.c cdf0a000315332fc9b50b62f3b5e22e080a0952b
- F src/loadext.c f20382fbaeec832438a1ba7797bee3d3c8a6d51d
- F src/main.c e8e33e613698f3138031c037ce9d87a0030955c1
+ F src/loadext.c 1422eba4aa2b1fb5f7b3aef574752272477d21e2
 -F src/main.c 8d204866d1abf5100503dcd54d3187b88f6846b7
++F src/main.c 40097dfb4844b9272dc45926a73cd9b01a1bd137
  F src/malloc.c fe085aa851b666b7c375c1ff957643dc20a04bf6
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 437c7c4af964895d4650f29881df63535caaa1fa
@@@ -184,19 -172,19 +184,19 @@@ F src/pragma.c bdb484d0283965c431d4153f
  F src/prepare.c 931ad0d852a0df48f79adcba6ce79ca5f475625c
  F src/printf.c 4a9f882f1c1787a8b494a2987765acf9d97ac21f
  F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
- F src/resolve.c 652ae6dc0f185b01b4536bb2fa7d878f13f0f1df
+ F src/resolve.c 9079da7d59aed2bb14ec8315bc7f720dd85b5b65
  F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
- F src/select.c 7818b5c9b497499d8bd8c6d0e347a3cf67724867
- F src/shell.c 266791241d7add796ccce2317977ae6c3c67d77f
- F src/sqlite.h.in ebb2e60b1d92290597f8520dc55a5885c88aefc0
+ F src/select.c e1c6f6abdf9f359f4e735cb8ae11d2f359bf52a9
+ F src/shell.c 7c41bfcd9e5bf9d96b9215f79b03a5b2b44a3bca
 -F src/sqlite.h.in 31045976254225e6bf046a96e87b40fa4c1d55e4
++F src/sqlite.h.in 7c9b66c397025a9e93e1ec1faa03324b757a2880
  F src/sqlite3.rc fea433eb0a59f4c9393c8e6d76a6e2596b1fe0c0
- F src/sqlite3ext.h 6904f4aadf976f95241311fbffb00823075d9477
- F src/sqliteInt.h 61a59586451072ec2b3aaa209e5df87fa6e1bf75
+ F src/sqlite3ext.h 7183ab832e23db0f934494f16928da127a571d75
 -F src/sqliteInt.h 601c887f6d9c92e75551873c0a34711fff745bed
++F src/sqliteInt.h 4b854bf7da123c2bab96664afaac8d14e6027524
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c bedc37ec1a6bb9399944024d63f4c769971955a9
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
 -F src/tclsqlite.c 3213f3101e3b85f047d6e389da5a53d76d3d7540
 +F src/tclsqlite.c bc021495cad081c13ccdcebd524857aedd831e11
- F src/test1.c 50003e3beccad5569f757598fc7ce81b4f21aa7e
+ F src/test1.c ff3e68eedfbd858c9b89cf03e3db233cd29be1d0
  F src/test2.c 4178056dd1e7d70f954ad8a1e3edb71a2a784daf
  F src/test3.c 3c3c2407fa6ec7a19e24ae23f7cb439d0275a60d
  F src/test4.c bf9fa9bece01de08e6f5e02314e4af5c13590dfa
@@@ -251,12 -239,12 +251,12 @@@ F src/update.c abb0fcabe551dae0a133fd2a
  F src/utf.c 8d819e2e5104a430fc2005f018db14347c95a38f
  F src/util.c 0af2e515dc0dabacec931bca39525f6c3f1c5455
  F src/vacuum.c 2727bdd08847fcb6b2d2da6d14f018910e8645d3
 -F src/vdbe.c 292f8f7ced59c29c63fe17830cbe5f5a0230cdf0
 -F src/vdbe.h b52887278cb173e66188da84dfab216bea61119d
 -F src/vdbeInt.h 396bb03eec560f768d1b86092b00f46c25575d3b
 -F src/vdbeapi.c 9616986209cc77822aa9f7d91cf9e6880516d557
 -F src/vdbeaux.c 735a6905df302a7f3c715a82bd3af06dc7d74ef2
 -F src/vdbeblob.c 32f2a4899d67f69634ea4dd93e3f651936d732cb
 +F src/vdbe.c 9e4164ac85aa01e1a563e6c7f565b106ff0bf67b
 +F src/vdbe.h 1223e2548e0970cf96f573ff6b99f804a36ad683
 +F src/vdbeInt.h 0112cab1c820a599005c6bcc9504bdb17f5dbcdb
- F src/vdbeapi.c 58fdcd56109c05876f69c25d47a138ef370d3647
++F src/vdbeapi.c b816227ece97354aee7a741c1fc3c5445202d8bb
 +F src/vdbeaux.c 684c159170453c8a118786b9c174627ece825f3a
 +F src/vdbeblob.c 11248c6362389569764682eb0f59ce910f3cc381
  F src/vdbemem.c cb55e84b8e2c15704968ee05f0fae25883299b74
  F src/vdbesort.c c61ca318681c0e7267da8be3abfca8469652a7e9
  F src/vdbetrace.c 8bd5da325fc90f28464335e4cc4ad1407fe30835
@@@ -667,8 -656,8 +668,8 @@@ F test/pageropt.test 9191867ed19a2b3db6
  F test/pagesize.test 1dd51367e752e742f58e861e65ed7390603827a0
  F test/pcache.test 065aa286e722ab24f2e51792c1f093bf60656b16
  F test/pcache2.test a83efe2dec0d392f814bfc998def1d1833942025
 -F test/permutations.test 360b92859c0af814b3fe10b68746936389606501
 +F test/permutations.test 379cfbb9a5eea2499d05008c04d18ddb4f2c01a9
- F test/pragma.test 5ce333cae37d86cfe9b3add840906e375e2272b0
+ F test/pragma.test 60d29cd3d8098a2c20bf4c072810f99e3bf2757a
  F test/pragma2.test 3a55f82b954242c642f8342b17dffc8b47472947
  F test/printf.test ec9870c4dce8686a37818e0bf1aba6e6a1863552
  F test/progress.test 5b075c3c790c7b2a61419bc199db87aaf48b8301
@@@ -765,7 -753,7 +766,7 @@@ F test/tclsqlite.test a7308276aad2e6c0b
  F test/tempdb.test 19d0f66e2e3eeffd68661a11c83ba5e6ace9128c
  F test/temptable.test 51edd31c65ed1560dd600b1796e8325df96318e2
  F test/temptrigger.test 26670ed7a39cf2296a7f0a9e0a1d7bdb7abe936d
- F test/tester.tcl 92c630363217d4e2af8464d1acd387fadd710ab7
 -F test/tester.tcl 2918ebca150b67ca25b1682f8ecd857af77fab05
++F test/tester.tcl a59fdc17860da8590988352ae4ba0dadf4266e10
  F test/thread001.test 9f22fd3525a307ff42a326b6bc7b0465be1745a5
  F test/thread002.test e630504f8a06c00bf8bbe68528774dd96aeb2e58
  F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@@ -1047,7 -1037,7 +1050,7 @@@ F tool/vdbe-compress.tcl f12c884766bd14
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
  F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
- P 82d3d1ae824e1fbc7958657be79231590ec17ace 2cef8b68f0e1216cf68bb7dd45a5a9a330748070
- R e54b78fdc1653174f63d383c576bd990
 -P ce4ac66a4b623a3cee1a63089dd5ba8341244f1e
 -R d68087991aff1a0f42c82b57cc68e943
++P 7e14dc734d7d941da5c3aa6612e26d93b5b929bd 7097241c1220ada318f8eda938c3e3430b94a606
++R e469c56b0b932202c050a14daa3532bb
  U drh
- Z ee3bd01f1e30ad2e6302010368aa9999
 -Z 8c08911ad7848ca72da641a08c68b6f0
++Z a8cbf1c861240eb4a7fc756e2ad3beac

diff --cc manifest.uuid
index cb2d1c59b2afe92e08c32af641d6dc702bf7cfdf,e12fd1d206d8c9819c08a9562cfa6bf95fec8083..9a0a84d2e1bdaa9f7b5d074a9e19b78f06b7da0e
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 7e14dc734d7d941da5c3aa6612e26d93b5b929bd
 -7097241c1220ada318f8eda938c3e3430b94a606
++d69d21903b883067c66dbcdefe6b369a6fe328b0

diff --cc src/main.c
Simple merge

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

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/vdbeapi.c
Simple merge

diff --cc test/tester.tcl
Simple merge