Merge all recent trunk changes into the sessions branch.

FossilOrigin-Name: 3879ab1b532828fcc12a50a95b6730faebcb69e9

diff --cc Makefile.in
index c375daa2327b6012610cfdfa520a978561c36e33,068da1a2128919f27ce6bdd30f33dbbaaaf85ccf..b01e16a4997186250b9e4e9e99b70b57bade83d9
--- 1/Makefile.in
--- 2/Makefile.in
+++ b/Makefile.in
@@@ -390,12 -381,22 +388,23 @@@ TESTSRC = 
    $(TOP)/src/test_tclvar.c \
    $(TOP)/src/test_thread.c \
    $(TOP)/src/test_vfs.c \
-   $(TOP)/src/test_wholenumber.c \
    $(TOP)/src/test_wsd.c       \
    $(TOP)/ext/fts3/fts3_term.c \
 -  $(TOP)/ext/fts3/fts3_test.c 
 +  $(TOP)/ext/fts3/fts3_test.c  \
 +  $(TOP)/ext/session/test_session.c
  
+ # Statically linked extensions
+ #
+ TESTSRC += \
+   $(TOP)/ext/misc/amatch.c \
+   $(TOP)/ext/misc/closure.c \
+   $(TOP)/ext/misc/fuzzer.c \
+   $(TOP)/ext/misc/ieee754.c \
+   $(TOP)/ext/misc/nextchar.c \
+   $(TOP)/ext/misc/regexp.c \
+   $(TOP)/ext/misc/spellfix.c \
+   $(TOP)/ext/misc/wholenumber.c
+ 
  # Source code to the library files needed by the test fixture
  #
  TESTSRC2 = \

diff --cc Makefile.msc
index db3ec3f2f85b5450a401df1f070056a8150004f8,1c862648044e9a48af78eecb204d63f6beca5040..86217cc30d3d32451e40ab295e6655c18affc195
--- 1/Makefile.msc
--- 2/Makefile.msc
+++ b/Makefile.msc
@@@ -711,14 -701,24 +709,26 @@@ TESTSRC = 
    $(TOP)\src\test_tclvar.c \
    $(TOP)\src\test_thread.c \
    $(TOP)\src\test_vfs.c \
-   $(TOP)\src\test_wholenumber.c \
    $(TOP)\src\test_wsd.c \
    $(TOP)\ext\fts3\fts3_term.c \
 -  $(TOP)\ext\fts3\fts3_test.c
 +  $(TOP)\ext\fts3\fts3_test.c \
 +  $(TOP)\ext\session\test_session.c
  
+ # Statically linked extensions
+ #
+ TESTEXT = \
+   $(TOP)\ext\misc\amatch.c \
+   $(TOP)\ext\misc\closure.c \
+   $(TOP)\ext\misc\fuzzer.c \
+   $(TOP)\ext\misc\ieee754.c \
+   $(TOP)\ext\misc\nextchar.c \
+   $(TOP)\ext\misc\regexp.c \
+   $(TOP)\ext\misc\spellfix.c \
+   $(TOP)\ext\misc\wholenumber.c
+ 
+ 
  # Source code to the library files needed by the test fixture
 +# (non-amalgamation)
  #
  TESTSRC2 = \
    $(TOP)\src\attach.c \
@@@ -1227,8 -1214,8 +1237,8 @@@ sqlite3session.lo:      $(TOP)\ext\session\s
  TESTFIXTURE_FLAGS = -DTCLSH=1 -DSQLITE_TEST=1 -DSQLITE_CRASH_TEST=1
  TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_SERVER=1 -DSQLITE_PRIVATE="" -DSQLITE_CORE
  
- TESTFIXTURE_SRC0 = $(TESTSRC2) libsqlite3.lib
- TESTFIXTURE_SRC1 = $(TESTSRC3) sqlite3.c
+ TESTFIXTURE_SRC0 = $(TESTEXT) $(TESTSRC2) libsqlite3.lib
 -TESTFIXTURE_SRC1 = $(TESTEXT) sqlite3.c
++TESTFIXTURE_SRC1 = $(TESTEXT) $(TESTSRC3) sqlite3.c
  !IF $(USE_AMALGAMATION)==0
  TESTFIXTURE_SRC = $(TESTSRC) $(TOP)\src\tclsqlite.c $(TESTFIXTURE_SRC0)
  !ELSE

diff --cc main.mk
Simple merge

diff --cc manifest
index 2dc92ae73db78a883b55f886a888e05310e98f79,366bb2d49779fa7cdb796a7e5e49116249e3f149..08e704d66ef0cf40247e3fcd32509ff2a6792e67
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,12 -1,12 +1,12 @@@
- C Merge\sthe\slatest\strunk\schanges\sinto\sthe\ssessions\sbranch.
- D 2013-04-22T23:59:06.075
 -C Allocate\smeta(8)\sin\sthe\sheader\sas\sthe\s"application\sID"\sand\sadd\sthe\n"PRAGMA\sapplication_id"\scommand\sto\squery\sand\sset\sit.
 -D 2013-05-03T15:23:24.035
++C Merge\sall\srecent\strunk\schanges\sinto\sthe\ssessions\sbranch.
++D 2013-05-03T18:29:22.159
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 4db477715e5d66fdcbb4f7a0870d10b0adbe007e
 -F Makefile.in ce81671efd6223d19d4c8c6b88ac2c4134427111
++F Makefile.in e2acdd75b30e5f2fd8739c923c746d9d2228fe9a
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc 95b9e9992abcb32dda9ad7460bb1c4a3e0985909
 -F Makefile.msc 8f4ee0dab220a5276d5da61149dfd6cd5d1dd5b8
++F Makefile.msc af9891d1f609607a54524f4ccabcbe5c38e4a8e3
  F Makefile.vxworks db21ed42a01d5740e656b16f92cb5d8d5e5dd315
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
 -F VERSION 05c7bd63b96f31cfdef5c766ed91307ac121f5aa
 +F VERSION 0dee4d2e0c64791ff0085277424fb5c07d79fc9a
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F addopcodes.awk 17dc593f791f874d2c23a0f9360850ded0286531
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
@@@ -83,6 -83,14 +83,14 @@@ F ext/fts3/unicode/mkunicode.tcl 7a9bc0
  F ext/icu/README.txt d9fbbad0c2f647c3fdf715fc9fd64af53aedfc43
  F ext/icu/icu.c eb9ae1d79046bd7871aa97ee6da51eb770134b5a
  F ext/icu/sqliteicu.h 728867a802baa5a96de7495e9689a8e01715ef37
 -F ext/misc/fuzzer.c fb64a15af978ae73fa9075b9b1dfbe82b8defc6f
+ F ext/misc/amatch.c 3369b2b544066e620d986f0085d039c77d1ef17f
+ F ext/misc/closure.c fec0c8537c69843e0b7631d500a14c0527962cd6
 -F ext/misc/regexp.c c25c65fe775f5d9801fb8573e36ebe73f2c0c2e0
 -F ext/misc/spellfix.c f9d24a2b2617cee143b7841b453e4e1fd8f189cc
 -F ext/misc/wholenumber.c ce362368b9381ea48cbd951ade8df867eeeab014
++F ext/misc/fuzzer.c fb64a15af978ae73fa9075b9b1dfbe82b8defc6f w src/test_fuzzer.c
+ F ext/misc/ieee754.c 2565ce373d842977efe0922dc50b8a41b3289556
+ F ext/misc/nextchar.c 1131e2b36116ffc6fe6b2e3464bfdace27978b1e
++F ext/misc/regexp.c c25c65fe775f5d9801fb8573e36ebe73f2c0c2e0 w src/test_regexp.c
++F ext/misc/spellfix.c f9d24a2b2617cee143b7841b453e4e1fd8f189cc w src/test_spellfix.c
++F ext/misc/wholenumber.c ce362368b9381ea48cbd951ade8df867eeeab014 w src/test_wholenumber.c
  F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761
  F ext/rtree/rtree.c 757abea591d4ff67c0ff4e8f9776aeda86b18c14
  F ext/rtree/rtree.h 834dbcb82dc85b2481cde6a07cdadfddc99e9b9e
@@@ -102,21 -110,10 +110,22 @@@ F ext/rtree/rtree_util.tcl 06aab2ed5b82
  F ext/rtree/sqlite3rtree.h c34c1e41d1ab80bb8ad09aae402c9c956871a765
  F ext/rtree/tkt3363.test 142ab96eded44a3615ec79fba98c7bde7d0f96de
  F ext/rtree/viewrtree.tcl eea6224b3553599ae665b239bd827e182b466024
 +F ext/session/session1.test 502086908e4144dfaccb1baa77bc29d75a9daace
 +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/session6.test 443789bc2fca12e4f7075cf692c60b8a2bea1a26
 +F ext/session/session8.test 7d35947ad329b8966f095d34f9617a9eff52dc65
 +F ext/session/session_common.tcl 1539d8973b2aea0025c133eb0cc4c89fcef541a5
 +F ext/session/sessionfault.test 496291b287ba3c0b14ca2e074425e29cc92a64a6
 +F ext/session/sqlite3session.c 7d7ca693bd581243835ee47b41b491bd909a26f4
 +F ext/session/sqlite3session.h f374c9c4c96e08f67ac418871c29d423245c7673
 +F ext/session/test_session.c ea4dc9b4a1895c8e6bddcbfe3838d7eb57df2d99
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
- F main.mk 88fb64131032933d96fd65039a6dd9140beb2566
+ F magic.txt 291863ca976425e2e7bf3f775eb98ece4dd120f6
 -F main.mk 1b25be82452366abc27cc9ab2acf3244a773d5a1
++F main.mk 06e980ed70c3fa4c27c35ff38735af6e05a64304
  F mkdll.sh 7d09b23c05d56532e9d44a50868eb4b12ff4f74a
  F mkextu.sh 416f9b7089d80e5590a29692c9d9280a10dbad9f
  F mkextw.sh 4123480947681d9b434a5e7b1ee08135abe409ac
@@@ -148,8 -145,8 +157,8 @@@ F src/callback.c d7e46f40c3cf53c43550b7
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
  F src/ctime.c 4262c227bc91cecc61ae37ed3a40f08069cfa267
  F src/date.c 067a81c9942c497aafd2c260e13add8a7d0c7dd4
 -F src/delete.c aeabdabeeeaa0584127f291baa9617153d334778
 +F src/delete.c 39a770e9729b1acd2de347f8f614584841d0083e
- F src/expr.c 48048fca951eedbc74aa32262154410d56c83812
+ F src/expr.c 437c03d5bb4fe3a53ecab3ad0286d6c5260da7ed
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c e16942bd5c8a868ac53287886464a5ed0e72b179
  F src/func.c d3fdcff9274bc161152e67ed3f626841c247f4b9
@@@ -191,19 -188,19 +200,19 @@@ F src/pragma.c 8779308bc1ea1901c4bc94df
  F src/prepare.c 743e484233c51109666d402f470523553b41797c
  F src/printf.c 4a9f882f1c1787a8b494a2987765acf9d97ac21f
  F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
- F src/resolve.c 10a1b332e3eb36e5d561085e18c58a8578cd7d73
+ F src/resolve.c 83cc2d942ee216bc56956c6e6fadb691c1727fa1
  F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
- F src/select.c 01540bcd3df3c8f1187158e77986028b1c667258
- F src/shell.c aca9d94653decd4496846dee0c7ba83eaf96a46d
- F src/sqlite.h.in eddda5f1967e84336e11f3a5c6fd3be3337d66c1
+ F src/select.c 6bfbe11e2fef81c5e18d30513ab6c69f171667eb
+ F src/shell.c 5d527e5d08f05ec2c43ff194ea44bf62b974f4c9
 -F src/sqlite.h.in 5a5a22a9b192d81a9e5dee00274e3a0484c4afb1
++F src/sqlite.h.in 3b9c6d8e5b3b93e39c266c9534369042c14e9a31
  F src/sqlite3.rc fea433eb0a59f4c9393c8e6d76a6e2596b1fe0c0
  F src/sqlite3ext.h d936f797812c28b81b26ed18345baf8db28a21a5
- F src/sqliteInt.h a9f727c0d568f64f06ae430e55a074d8dd1ccde4
 -F src/sqliteInt.h de835c584032769461c123a564381f9808542c0e
++F src/sqliteInt.h 4b768ec538d5ed20f5ca0196a25c2c029b8513cb
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c bedc37ec1a6bb9399944024d63f4c769971955a9
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
- F src/tclsqlite.c a15550a334ca07ac2bc5d32c5f97e3d61be886e8
- F src/test1.c 6784fdacb35c33ba564ef749b62c4718fe515484
 -F src/tclsqlite.c 2ecec9937e69bc17560ad886da35195daa7261b8
++F src/tclsqlite.c c21f61c56d519b4bcc0dcf453953edba69266854
+ F src/test1.c 2b0ec224983403312a4d1db8546e1e1c45694251
  F src/test2.c 29e7154112f7448d64204e8d31179cf497ecf425
  F src/test3.c 96aed72a8e1d542fed127e3e8350ae357712fa82
  F src/test4.c cea2c55110241e4674e66d476d29c914627999f5
@@@ -253,17 -247,16 +259,16 @@@ F src/test_vfstrace.c 34b544e80ba7fb77b
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/tokenize.c 1e86210d3976717a19238ea7b047fac481fe8c12
  F src/trigger.c cd95ac64efa60e39faf9b5597443192ff27a22fa
 -F src/update.c a2a5631d618cbe240fc83725fa9e95c56ae0084c
 +F src/update.c beef58f5fd66153ac9cdf6e9f6551f09ee68976c
  F src/utf.c 8d819e2e5104a430fc2005f018db14347c95a38f
  F src/util.c f566b5138099a2df8533b190d0dcc74b7dfbe0c9
- F src/vacuum.c 2727bdd08847fcb6b2d2da6d14f018910e8645d3
+ F src/vacuum.c ddf21cc9577c4cb459d08bee9863a78ec000c5bb
 -F src/vdbe.c 5f0047130f80c7fd0bc41bc51a653b5542c4fbd5
 -F src/vdbe.h b52887278cb173e66188da84dfab216bea61119d
 -F src/vdbeInt.h c1e830268b75f04a2901dd895b51a637a26c7045
 -F src/vdbeapi.c 085cf9bf169b859a6c8fa43791702bac805cb7aa
 -F src/vdbeaux.c ecb43014bcd3019e5aa2b5561e5c3a447f007a08
 -F src/vdbeblob.c 5dc79627775bd9a9b494dd956e26297946417d69
 +F src/vdbe.c 349798f630ce49c2e21a6c30863f195c484cfec5
 +F src/vdbe.h 1223e2548e0970cf96f573ff6b99f804a36ad683
 +F src/vdbeInt.h a6b7a1fbb2b335fd8c3b4b8a696b1ba28eae2191
 +F src/vdbeapi.c 5899f359cb51c6949aeff50a806275c94fe73fce
 +F src/vdbeaux.c 426263e901f19d8fe6bc7124ee5dafc78a2feac3
 +F src/vdbeblob.c 1268e0bcb8e21fa32520b0fc376e1bcdfaa0c642
  F src/vdbemem.c 833005f1cbbf447289f1973dba2a0c2228c7b8ab
  F src/vdbesort.c 4fad64071ae120c25f39dcac572d716b9cadeb7f
  F src/vdbetrace.c 3ad1b4e92b60c082a02ac563da4a2735cc7d297c
@@@ -539,9 -534,9 +546,9 @@@ F test/fuzz2.test 207d0f9d06db3eaf47a6b
  F test/fuzz3.test aec64345184d1662bd30e6a17851ff659d596dc5
  F test/fuzz_common.tcl a87dfbb88c2a6b08a38e9a070dabd129e617b45b
  F test/fuzz_malloc.test 328f70aaca63adf29b4c6f06505ed0cf57ca7c26
- F test/fuzzer1.test a2e93bb1e19513dd6bf9c63d3d7c4673c983ca19
- F test/fuzzerfault.test ff2282c81797b6a355f0748d8b54c7287c5d2b25
+ F test/fuzzer1.test 41bd5aa6ae0cf18d06342a4476e3cad98604ae48
+ F test/fuzzerfault.test 8792cd77fd5bce765b05d0c8e01b9edcf8af8536
 -F test/hook.test 45cb22b940c3cc0af616ba7430f666e245711a48
 +F test/hook.test 777b2541f6dd4f4ca5e8d6b66c1df1b3717aeab6
  F test/icu.test 70df4faca133254c042d02ae342c0a141f2663f4
  F test/in.test 5941096407d8c133b9eff15bd3e666624b6cbde3
  F test/in2.test 5d4c61d17493c832f7d2d32bef785119e87bde75
@@@ -682,8 -677,8 +689,8 @@@ F test/pageropt.test 6b8f6a123a5572c195
  F test/pagesize.test 1dd51367e752e742f58e861e65ed7390603827a0
  F test/pcache.test 065aa286e722ab24f2e51792c1f093bf60656b16
  F test/pcache2.test a83efe2dec0d392f814bfc998def1d1833942025
- F test/permutations.test a19a70a80836b5e183e46f4043fb7626446ab5e0
- F test/pragma.test 60d29cd3d8098a2c20bf4c072810f99e3bf2757a
 -F test/permutations.test 3d0bab9c49c1ec08b868059e30a3e1956f2162e2
++F test/permutations.test 1981ef401ecd5292058c19ee10c94aa17c9039fd
+ F test/pragma.test 5e7de6c32a5d764f09437d2025f07e4917b9e178
  F test/pragma2.test 3a55f82b954242c642f8342b17dffc8b47472947
  F test/printf.test ec9870c4dce8686a37818e0bf1aba6e6a1863552
  F test/progress.test 5b075c3c790c7b2a61419bc199db87aaf48b8301
@@@ -731,9 -726,8 +738,9 @@@ F test/select9.test c0ca3cd87a8ebb04de2
  F test/selectA.test 06d1032fa9009314c95394f2ca2e60d9f7ae8532
  F test/selectB.test 954e4e49cf1f896d61794e440669e03a27ceea25
  F test/selectC.test 871fb55d884d3de5943c4057ebd22c2459e71977
- F test/selectD.test 03f7c1ea8d5ab3c637cbc30fcbbbac96b988c162
+ F test/selectD.test b0f02a04ef7737decb24e08be2c39b9664b43394
  F test/server1.test 46803bd3fe8b99b30dbc5ff38ffc756f5c13a118
 +F test/session.test c1a17c11ef7d01c24fe2b9f7871190d949a8e718
  F test/shared.test 1da9dbad400cee0d93f252ccf76e1ae007a63746
  F test/shared2.test 03eb4a8d372e290107d34b6ce1809919a698e879
  F test/shared3.test ebf77f023f4bdaa8f74f65822b559e86ce5c6257
@@@ -1067,7 -1061,7 +1074,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 67b3c0efa7d5e0cb7cc0fc7606ab3f26ea5419fd 1a1cf5aa86734c832d845e07780262a178188d56
- R 732bd62d8f3cf92b7ff68a9a14e06f6a
 -P b81e87e72b976e7157a53a50abc5422e2a6c4c39 5a500848d2fa96fc7397e2acb64d5ae6551b5b1e
 -R d15cd031ae2a811b0ed19162e796056a
++P 6994826c0784280f2e9728dfa4185848846d03df b2efe4f225adc5f4c2e3080bf459cc52fff82e18
++R 70853c32af7db548acc44e4c7931cc60
  U drh
- Z d4e35c064e319291a70a72e245362c9b
 -Z 0ae0a427ab8e27618336357d13716971
++Z ccdd14f93f4b60d77de88619ca7032d3

diff --cc manifest.uuid
index 48e7eca1776d55c3dc6eb1f7586b1e79d3b6e9a3,2b2da7ddae362211c7c3611901e37afaabdb6dec..6d8df55db28023e6feca28b534d9c8e415798122
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 6994826c0784280f2e9728dfa4185848846d03df
 -b2efe4f225adc5f4c2e3080bf459cc52fff82e18
++3879ab1b532828fcc12a50a95b6730faebcb69e9

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

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/tclsqlite.c
index 3b175ce2aeff51e169f0d76a33ae45720a502536,f1bb2921da0c68a4f1c8e15cf566b233e92a519f..9bd111d9475a89463b30e23ffa5325200af6aa99
--- 1/src/tclsqlite.c
--- 2/src/tclsqlite.c
+++ b/src/tclsqlite.c
@@@ -3829,12 -3683,6 +3829,9 @@@ static void init_all(Tcl_Interp *interp
      extern int Sqlitemultiplex_Init(Tcl_Interp*);
      extern int SqliteSuperlock_Init(Tcl_Interp*);
      extern int SqlitetestSyscall_Init(Tcl_Interp*);
-     extern int Sqlitetestfuzzer_Init(Tcl_Interp*);
-     extern int Sqlitetestwholenumber_Init(Tcl_Interp*);
 +#if defined(SQLITE_ENABLE_SESSION) && defined(SQLITE_ENABLE_PREUPDATE_HOOK)
 +    extern int TestSession_Init(Tcl_Interp*);
 +#endif
-     extern int Sqlitetestregexp_Init(Tcl_Interp*);
  
  #if defined(SQLITE_ENABLE_FTS3) || defined(SQLITE_ENABLE_FTS4)
      extern int Sqlitetestfts3_Init(Tcl_Interp *interp);
@@@ -3877,12 -3725,6 +3874,9 @@@
      Sqlitemultiplex_Init(interp);
      SqliteSuperlock_Init(interp);
      SqlitetestSyscall_Init(interp);
-     Sqlitetestfuzzer_Init(interp);
-     Sqlitetestwholenumber_Init(interp);
 +#if defined(SQLITE_ENABLE_SESSION) && defined(SQLITE_ENABLE_PREUPDATE_HOOK)
 +    TestSession_Init(interp);
 +#endif
-     Sqlitetestregexp_Init(interp);
  
  #if defined(SQLITE_ENABLE_FTS3) || defined(SQLITE_ENABLE_FTS4)
      Sqlitetestfts3_Init(interp);

diff --cc test/permutations.test
Simple merge