From: dan <dan@noemail.net>
Date: Wed, 22 Jun 2011 12:01:08 +0000 (+0000)
Subject: Update sessions branch with latest trunk changes.
X-Git-Tag: version-3.13.0~148^2~270
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=53ae686bfbb8c1078333d4da10ee137f93e0d3b7;p=thirdparty%2Fsqlite.git

Update sessions branch with latest trunk changes.

FossilOrigin-Name: 48d5cab3ac08b25ec94d6ecfd25779320558110f
---

53ae686bfbb8c1078333d4da10ee137f93e0d3b7
diff --cc main.mk
index d1229405ab,33b2e6ec14..b5dfc22511
--- a/main.mk
+++ b/main.mk
@@@ -301,12 -301,9 +302,11 @@@ TESTSRC2 = 
    $(TOP)/ext/fts3/fts3.c \
    $(TOP)/ext/fts3/fts3_aux.c \
    $(TOP)/ext/fts3/fts3_expr.c \
-   $(TOP)/ext/fts3/fts3_term.c \
    $(TOP)/ext/fts3/fts3_tokenizer.c \
    $(TOP)/ext/fts3/fts3_write.c \
 -  $(TOP)/ext/async/sqlite3async.c
 +  $(TOP)/ext/async/sqlite3async.c \
 +  $(TOP)/ext/session/sqlite3session.c \
 +  $(TOP)/ext/session/test_session.c
  
  # Header files used by all library source files.
  #
diff --cc manifest
index 55808a4f17,bb6eff7db1..9fde5b8fdf
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\sthe\slatest\strunk\schanges\sinto\sthe\ssessions\sbranch.
- D 2011-06-21T01:29:16.319
 -C Change\sa\stest\scase\sin\stypes3.test\sslightly\sso\sthat\sit\sworks\swith\sthe\slatest\sversions\sof\sTcl.
 -D 2011-06-22T10:56:54.742
++C Update\ssessions\sbranch\swith\slatest\strunk\schanges.
++D 2011-06-22T12:01:09
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in c1d7a7f4fd8da6b1815032efca950e3d5125407e
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -102,19 -102,9 +102,19 @@@ F ext/rtree/rtree_util.tcl 06aab2ed5b82
  F ext/rtree/sqlite3rtree.h 1af0899c63a688e272d69d8e746f24e76f10a3f0
  F ext/rtree/tkt3363.test 142ab96eded44a3615ec79fba98c7bde7d0f96de
  F ext/rtree/viewrtree.tcl eea6224b3553599ae665b239bd827e182b466024
 +F ext/session/session1.test f5d9f2e362abe2563181389509822bda956516ee
 +F ext/session/session2.test 99ca0da7ddb617d42bafd83adccf99f18ae0384b
 +F ext/session/session3.test a7a9ce59b8d1e49e2cc23d81421ac485be0eea01
 +F ext/session/session4.test a6ed685da7a5293c5d6f99855bcf41dbc352ca84
 +F ext/session/session5.test 8fdfaf9dba28a2f1c6b89b06168bdab1fef2d478
 +F ext/session/session_common.tcl 1539d8973b2aea0025c133eb0cc4c89fcef541a5
 +F ext/session/sessionfault.test 401045278298a242cbc2e4bc986c102f01ff2180
 +F ext/session/sqlite3session.c 26de50c3e34d89ae62e97024ad07e772e1c52db2
 +F ext/session/sqlite3session.h 665f5591562e3c71eb3d0da26f1a1efae26f7bcf
 +F ext/session/test_session.c 311e5b9228374d0b5780448f289847ff1cf7d388
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
- F main.mk c864cbc95010ff6bdb6ec6d213c17be0bd2a86a2
 -F main.mk d799fb600383cee11fed58876a7cccb749dd2614
++F main.mk f56d9895882f5cdd9f9f9ba8f8a679e9202288c1
  F mkdll.sh 7d09b23c05d56532e9d44a50868eb4b12ff4f74a
  F mkextu.sh 416f9b7089d80e5590a29692c9d9280a10dbad9f
  F mkextw.sh 4123480947681d9b434a5e7b1ee08135abe409ac
@@@ -141,8 -131,8 +141,8 @@@ F src/build.c 5a428625d21ad409514afb40a
  F src/callback.c 0425c6320730e6d3981acfb9202c1bed9016ad1a
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
  F src/ctime.c 7deec4534f3b5a0c3b4a4cbadf809d321f64f9c4
- F src/date.c 1548fdac51377e4e7833251de878b4058c148e1b
+ F src/date.c d3c11de76392ea62637bfac0f4655889fc2f5a85
 -F src/delete.c cecc926c70783452f3e8eb452c728291ce1a0b21
 +F src/delete.c c84066147544e8fddb7ca60ac7fd36ed2df8487f
  F src/expr.c ab46ab0f0c44979a8164ca31728d7d10ae5e8106
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c 9fabba17a4d4778dc660f0cb9d781fc86d7b9d41
@@@ -156,7 -146,7 +156,7 @@@ F src/journal.c 552839e54d1bf76fb8f7abe
  F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f
  F src/lempar.c 7f026423f4d71d989e719a743f98a1cbd4e6d99e
  F src/loadext.c 3ae0d52da013a6326310655be6473fd472347b85
- F src/main.c f7e8176ec1a9cad97470801660629179570d6b1d
 -F src/main.c fa654e1802e14a5f6c09c37971c3b69c1001d9c8
++F src/main.c 8a386605c22e4b2becfe96bab2ac7128b480d489
  F src/malloc.c 591aedb20ae40813f1045f2ef253438a334775d9
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 00bd8265c81abb665c48fea1e0c234eb3b922206
@@@ -191,14 -181,14 +191,14 @@@ F src/resolve.c 1c0f32b64f8e3f555fe1f73
  F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
  F src/select.c d9d440809025a58547e39f4f268c2a296bfb56ff
  F src/shell.c 0e0173b3e79d956368013e759f084caa7995ecb1
- F src/sqlite.h.in 6bff7c59ae3cec01e628800b79ae87a2897c576c
 -F src/sqlite.h.in 4b7255c10d39c5faf089dbd29cde7c367ff39f1f
++F src/sqlite.h.in f292d325b466081f8980911316743192cce6832a
  F src/sqlite3ext.h c90bd5507099f62043832d73f6425d8d5c5da754
- F src/sqliteInt.h 928caa40080d47e8f92e1edee83f6249d03c5862
 -F src/sqliteInt.h a9248d3b0d2b1cf428d8642320fb13044a8888e0
++F src/sqliteInt.h 72cff2b19f04b1de96675fc7dbc1dd4645d90e05
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac64842c86cec2fc1a1d0e5c16d3beb8ad332bf
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
 -F src/tclsqlite.c 5db825be61708b1a2b3f8f6e185e9b753829acef
 +F src/tclsqlite.c 6a34149c9ff4a6f998a4cb8336d4481670b576b6
- F src/test1.c efca486a25fb894988e7a82e84579a4e57388a02
+ F src/test1.c ce2fab9e36932f5771c35291539366c9af229df3
  F src/test2.c 80d323d11e909cf0eb1b6fbb4ac22276483bcf31
  F src/test3.c 124ff9735fb6bb7d41de180d6bac90e7b1509432
  F src/test4.c d1e5a5e904d4b444cf572391fdcb017638e36ff7
@@@ -706,7 -695,7 +706,7 @@@ F test/tclsqlite.test 1ce9b6340d6d41242
  F test/tempdb.test 19d0f66e2e3eeffd68661a11c83ba5e6ace9128c
  F test/temptable.test f42121a0d29a62f00f93274464164177ab1cc24a
  F test/temptrigger.test b0273db072ce5f37cf19140ceb1f0d524bbe9f05
- F test/tester.tcl 7b91ddd9b2513024b4f95ac3c0151b2dab8433e0
 -F test/tester.tcl 7d3d17914ca5397a82f801db733b81d4a82f50c3
++F test/tester.tcl 3b6143fdafff36c516cf0fd663a20cd420aae36f
  F test/thread001.test a3e6a7254d1cb057836cb3145b60c10bf5b7e60f
  F test/thread002.test afd20095e6e845b405df4f2c920cb93301ca69db
  F test/thread003.test b824d4f52b870ae39fc5bae4d8070eca73085dca
@@@ -955,9 -945,10 +956,10 @@@ F tool/speedtest8.c 2902c46588c40b55661
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c
  F tool/symbols.sh bc2a3709940d47c8ac8e0a1fdf17ec801f015a00
+ F tool/tostr.awk 11760e1b94a5d3dcd42378f3cc18544c06cfa576
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings.sh 347d974d143cf132f953b565fbc03026f19fcb4d
- P 699b884383f735fb9630d87d25dab61c97dc4485 e60eefc76fa5066720d76858f6cfca56365330ee
- R e193f5c5190325b306fe583331238ae9
- U drh
- Z 4fd98ca50300bc27a920f010541b7f13
 -P 065e5a5ea4f82f0d3fbb2e80d3a977af96c95683
 -R bb24e8ea6743b27a72518b27f4017512
++P f3d148e0d10e16cd744ec88a2961fd617368c5ed 6e1f4df51ad32e36715cba16f9df0d17a08dc653
++R 13b557f9f4fbb1acb5f4e9d6383e3c30
+ U dan
 -Z 83a2b05b96f2ad1cc32e9a94b3d4ad63
++Z e013d0e7eccb6ac9a42c9313b4aac9ad
diff --cc manifest.uuid
index 4644aa1f38,9ca9b68227..86f3655672
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- f3d148e0d10e16cd744ec88a2961fd617368c5ed
 -6e1f4df51ad32e36715cba16f9df0d17a08dc653
++48d5cab3ac08b25ec94d6ecfd25779320558110f