]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Pull all the latest trunk changes into the sessions branch.
authordrh <drh@noemail.net>
Fri, 10 Feb 2012 17:54:52 +0000 (17:54 +0000)
committerdrh <drh@noemail.net>
Fri, 10 Feb 2012 17:54:52 +0000 (17:54 +0000)
FossilOrigin-Name: 361fb66a799f4f253e61ca94d999accde2c75b2c

1  2 
manifest
manifest.uuid
src/main.c
src/sqlite.h.in
src/sqliteInt.h
src/vdbe.c
src/vdbeInt.h
src/vdbeaux.c

diff --cc manifest
index 3561babe8931682f2c3cb8ce95d24eb6d2922b1b,fb04f1bdd873d62fc60e299628e0b14730f9c9b0..408205ca6d6585512a67f49d5a55eb904af2db9f
+++ b/manifest
@@@ -1,12 -1,12 +1,12 @@@
- C Support\sbuilding\swith\sSQLITE_ENABLE_SESSION\sunder\sMSVC.
- D 2012-01-16T12:33:36.900
 -C Disable\sthe\sability\sto\shave\smultiple\svalues\sin\sthe\sVALUES\sclause\sof\san\nINSERT\sstatement\swhen\sSQLITE_OMIT_COMPOUND_SELECT\sis\sused.
 -D 2012-02-10T17:38:58.524
++C Pull\sall\sthe\slatest\strunk\schanges\sinto\sthe\ssessions\sbranch.
++D 2012-02-10T17:54:52.604
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 3f79a373e57c3b92dabf76f40b065e719d31ac34
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc dcad80fa69f17d46fe6778ba873fc108ca16298d
 +F Makefile.msc 340b6d1bb4553c389d6837aa437d7c25dc03f980
  F Makefile.vxworks 1deb39c8bb047296c30161ffa10c1b5423e632f9
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
- F VERSION af03cd6400f9d71d38bdb7a9d66a1aefdc2f3e0d
+ F VERSION bb4c2a86abe53ea3c1d6ea515b69a426040e2414
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F addopcodes.awk 17dc593f791f874d2c23a0f9360850ded0286531
  F art/2005osaward.gif 0d1851b2a7c1c9d0ccce545f3e14bca42d7fd248
@@@ -145,11 -133,11 +145,11 @@@ F src/callback.c 0425c6320730e6d3981acf
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
  F src/ctime.c a9c26822515f81ec21588cbb482ca6724be02e33
  F src/date.c 067a81c9942c497aafd2c260e13add8a7d0c7dd4
 -F src/delete.c 51d32f0a9c880663e54ce309f52e40c325d5e112
 +F src/delete.c c6796c89280de6cbad73089adb4cdd01a4d4a1a7
- F src/expr.c 537591e95eac74af783e4eb033954fb218cf398e
+ F src/expr.c 00675123e0beec98f999aa4594d2cbe1fec33c1b
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c 657212460bf5cfd3ae607d12ea62092844c227b5
- F src/func.c 6261ce00aad9c63cd5b4219249b05683979060e9
+ F src/func.c d7925f33a8ce2207f86dea5cfb1a4379413312fe
  F src/global.c 4cfdca5cb0edd33c4d021baec4ede958cb2c793b
  F src/hash.c 458488dcc159c301b8e7686280ab209f1fb915af
  F src/hash.h 2894c932d84d9f892d4b4023a75e501f83050970
@@@ -159,10 -147,10 +159,10 @@@ F src/journal.c 552839e54d1bf76fb8f7abe
  F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f
  F src/lempar.c 0ee69fca0be54cd93939df98d2aca4ca46f44416
  F src/loadext.c f20382fbaeec832438a1ba7797bee3d3c8a6d51d
- F src/main.c 11e7d9ea1930f361ff58262752e4241dc371ecd7
 -F src/main.c cb099cc4864b542f97938049fc74ea8ae6845ce4
++F src/main.c 166f9571341f7084172f87e1931f0833778576eb
  F src/malloc.c 15afac5e59b6584efe072e9933aefb4230e74f97
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
- F src/mem1.c 7998e7003a3047e323c849a26dda004debc04d03
+ F src/mem1.c c953f3bfc8fcd31d4de2078697caefeb1dcfd7ff
  F src/mem2.c e307323e86b5da1853d7111b68fd6b84ad6f09cf
  F src/mem3.c 61c9d47b792908c532ca3a62b999cf21795c6534
  F src/mem5.c c2c63b7067570b00bf33d751c39af24182316f7f
@@@ -192,16 -180,16 +192,16 @@@ F src/printf.c 7ffb4ebb8b341f67e049695b
  F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
  F src/resolve.c 3d3e80a98f203ac6b9329e9621e29eda85ddfd40
  F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
- F src/select.c a1d075db66a0ea42807353501b62997969e5be79
- F src/shell.c aa4183d4a5243d8110b1d3d77faa4aea7e9c9c2d
- F src/sqlite.h.in 132b3140f29469dc1222a43fd9451c1785c80a51
+ F src/select.c 232283a2e60d91cbd9a5ddf2f6f7ecf53d590075
+ F src/shell.c aa28f117033ba3e44b5eaaf2ad572222bcdfd66e
 -F src/sqlite.h.in 371c30e4be94b9b0ea6400ed66663fcf8e891eb4
++F src/sqlite.h.in e805ca92bb66d958423dfcef12879e16bf547209
  F src/sqlite3ext.h 6904f4aadf976f95241311fbffb00823075d9477
- F src/sqliteInt.h 701b38210f369a802853894309af5185b44061b4
 -F src/sqliteInt.h 736f3a7748434200db7a9e0a352b67d1b8759e0a
++F src/sqliteInt.h b62e6f8dfc335f78e89721d54172fa12909e8f2e
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 4568e72dfd36b6a5911f93457364deb072e0b03a
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
 -F src/tclsqlite.c 2aeb69958965dad0842d5ea1456f1a958ef296e6
 +F src/tclsqlite.c 47d088f383a106b2914ac970586fdab66c1bd169
- F src/test1.c 1b1e514e85ffe7152b02cba38bd0a1ce8cd56113
+ F src/test1.c 328cbe4a4ee6d10d67ece2a7adaa2770569fae0f
  F src/test2.c 711555927f1f7e8db9aab86b512bc6934a774abe
  F src/test3.c 91d3f1a09cfae3533ef17d8b484a160f3d1f1a21
  F src/test4.c d1e5a5e904d4b444cf572391fdcb017638e36ff7
@@@ -252,16 -240,16 +252,16 @@@ F src/update.c 89de085a0bf4da448472029d
  F src/utf.c 890c67dcfcc7a74623c95baac7535aadfe265e84
  F src/util.c 9e07bd67dfafe9c75b1da78c87ba030cebbb5388
  F src/vacuum.c 0c0ba2242355c6048d65e2b333abe0f7c06348fa
- F src/vdbe.c 502f3deb63c24fbb3fe6b88a10c984ec897f5b7b
 -F src/vdbe.c 40b14dff04692b1ee421db40c67d4921ecf17a9d
 -F src/vdbe.h 18f581cac1f4339ec3299f3e0cc6e11aec654cdb
 -F src/vdbeInt.h 6ff4180a05683566a8835d12f7ec504b22932c82
 -F src/vdbeapi.c 3662b6a468a2a4605a15dfab313baa6dff81ad91
 -F src/vdbeaux.c 7683d772ad638faa4567142438c4594e47f173c4
 -F src/vdbeblob.c 32f2a4899d67f69634ea4dd93e3f651936d732cb
++F src/vdbe.c a24b861d9de4e26220c4656b6db22103b7e5f39f
 +F src/vdbe.h 87b8ff40de3f55dbcdc33029416862f517c37a2f
- F src/vdbeInt.h 1aa78a0c2d6e4fdc4b9b8ff29192e98182d25afa
++F src/vdbeInt.h f1956902b06b4f05ce965aafab6fe220a5477f9c
 +F src/vdbeapi.c 2fc381f651738feb2495cb001cf2114dea596cc3
- F src/vdbeaux.c ca1eada4b21723a67c510c0f456217c03ad15e48
++F src/vdbeaux.c b7c245fe73ed15090cf626f1250dcb7cdcfb1bd6
 +F src/vdbeblob.c 11248c6362389569764682eb0f59ce910f3cc381
- F src/vdbemem.c 4f7d25d5ea2e2040254095b8f6de07f8dbbadf80
- F src/vdbesort.c 468d43c057063e54da4f1988b38b4f46d60e7790
+ F src/vdbemem.c fb0ac964ccbcd94f595eb993c05bfd9c52468a4a
+ F src/vdbesort.c b25814d385895544ebc8118245c8311ded7f81c9
  F src/vdbetrace.c d6e50e04e1ec498150e519058f617d91b8f5c843
- F src/vtab.c e9318d88feac85be8e27ee783ac8f5397933fc8a
+ F src/vtab.c ab90fb600a3f5e4b7c48d22a4cdb2d6b23239847
  F src/wal.c 5f7bcc0610af759953defd769eacebfd98a22bc8
  F src/wal.h eaa00b9a403ddda2b56d01b7afc19ef600f9363f
  F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f
@@@ -1000,7 -989,7 +1002,7 @@@ F tool/tostr.awk e75472c2f98dd76e06b8c9
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
- P 01c84fd391a0ca1f5245c7eff0644d0cc6cff86b
- R 88d7ca9f3f2aa524ac3a66d4c2e7567b
- U mistachkin
- Z 171e4d9c94c739b476f164aff1375bac
 -P 1a16db0bca717a2582a48332d81854ca90d6d49b
 -R 4ae3522fd6eccbfc1737e8f5c9c63cf7
++P 2845654d425164de143e82b9fdb255d81a01af56 92131195d0c24c0116992db51ed5d8316626ba57
++R f655afae9aef18c1ea6dcf2304669fd0
+ U drh
 -Z 485b3d0d156b49609a8dc8c25c8298f5
++Z 91074916592f2b739d5ac72d0cab45cc
diff --cc manifest.uuid
index 6308588f15117455777006479acbf21ae97e9331,866f339ebe3303746f260602da4b0fcc50659764..c689c5bd17f01bb7529bfe4c878f9b2fb7cf25c0
@@@ -1,1 -1,1 +1,1 @@@
- 2845654d425164de143e82b9fdb255d81a01af56
 -92131195d0c24c0116992db51ed5d8316626ba57
++361fb66a799f4f253e61ca94d999accde2c75b2c
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/vdbe.c
Simple merge
diff --cc src/vdbeInt.h
Simple merge
diff --cc src/vdbeaux.c
Simple merge