Merge recent trunk changes into the sessions branch.

FossilOrigin-Name: 7e068e39b3b31364271664e0afb1cd95a235c26f

diff --cc Makefile.msc
Simple merge

diff --cc configure
Simple merge

diff --cc main.mk
Simple merge

diff --cc manifest
index 095aea71c6ef510710b14c0c9c3d025162351372,964e3c070ca76d8e726ed969ad9d0c61ac367b59..f7bca610819cc891e3286494d48cb6ad16df038c
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,12 -1,12 +1,12 @@@
- C Pull\sthe\slatest\strunk\schanges\sinto\sthe\ssessions\sbranch,\sand\sin\sparticular\nthe\scollating-sequence\srefactorization.
- D 2012-12-08T23:37:22.043
 -C Bring\sback\stest_regexp\schanges\sthat\swere\smade\swhen\sporting\sto\sFossil.\s\sAlso\nfix\ssome\sbugs\sthat\swere\sintroduced\sby\sthe\sFossil\sport.
 -D 2013-01-03T19:34:46.935
++C Merge\srecent\strunk\schanges\sinto\sthe\ssessions\sbranch.
++D 2013-01-03T22:22:55.634
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 690d441a758cbffd13e814dc2724a721a6ebd400
+ F Makefile.in a48faa9e7dd7d556d84f5456eabe5825dd8a6282
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc 26fd6e94ef8ed7d8b8c84b96b8347c52485f6d83
 -F Makefile.msc 2b8371775ea8df029d1acf0c3d4c3782d3bd5711
++F Makefile.msc f74e5635d39e882c915c8b988848a744b3fb3a6a
  F Makefile.vxworks b18ad88e9a8c6a001f5cf4a389116a4f1a7ab45f
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
- F VERSION edab4af5a4623f8198833ea481ce98ab53750a8d
+ F VERSION 6d4f66eaebabc42ef8c2a4d2d0caf4ce7ee81137
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F addopcodes.awk 17dc593f791f874d2c23a0f9360850ded0286531
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
@@@ -15,7 -15,7 +15,7 @@@ F art/sqlite370.jpg d512473dae7e378a67e
  F config.guess 226d9a188c6196f3033ffc651cbc9dcee1a42977
  F config.h.in 0921066a13130082764ab4ab6456f7b5bebe56de
  F config.sub 9ebe4c3b3dab6431ece34f16828b594fb420da55
- F configure 20ac96f94269b3e2417b91fac63a9db0eb0a9b15 x
 -F configure 00d3a5fda47ee7dd3e68dc9dad7eeb439cd1ffea x
++F configure 5f2564ac77bef7db2484083452b011822a02d515 x
  F configure.ac 81c43d151d0b0e406be056394cc9ff4cb3fd0444
  F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad
  F doc/lemon.html 334dbf6621b8fb8790297ec1abf3cfa4621709d1
@@@ -101,21 -101,9 +101,21 @@@ 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 57d04e1d6a3579e673e61dea29f214fb4e0fc505
 +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 d87518f07b121bd397117bf1f144f399388c7e06
 -F main.mk 718265bbf49a846c6898b4da09593eef4068fa39
++F main.mk f2fd62730fb5c7771f565f1ea9da70f481eb9577
  F mkdll.sh 7d09b23c05d56532e9d44a50868eb4b12ff4f74a
  F mkextu.sh 416f9b7089d80e5590a29692c9d9280a10dbad9f
  F mkextw.sh 4123480947681d9b434a5e7b1ee08135abe409ac
@@@ -141,17 -129,17 +141,17 @@@ 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 0e41d66d868b37dbc0e041c342e0036fad27e705
+ F src/expr.c 4dff0b04eaaf133789279c6b8cd69175dfbb1691
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
- F src/fkey.c dcb7c37a4bf526ded7b24a01a60fe071bcd160a2
+ F src/fkey.c 5b7a12e2f8620e855b0478a9a6798df9967bb277
  F src/func.c 8147799b048065a1590805be464d05b4913e652c
  F src/global.c e59ecd2c553ad0d4bfbc84ca71231336f8993a7a
  F src/hash.c ac3470bbf1ca4ae4e306a8ecb0fdf1731810ffe4
  F src/hash.h 2894c932d84d9f892d4b4023a75e501f83050970
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
 -F src/insert.c dc197aa9293a26d300eb5378880e701f7b20fefa
 +F src/insert.c 36c17b9b97a9287aa8561f138d893ddf2b25d0b2
- F src/journal.c eb7b9f5e783266521bcd9b2b93d419a219411f71
+ F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
  F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f
  F src/lempar.c cdf0a000315332fc9b50b62f3b5e22e080a0952b
  F src/loadext.c f20382fbaeec832438a1ba7797bee3d3c8a6d51d
@@@ -184,18 -172,18 +184,18 @@@ F src/pragma.c 8907c559d3127729d3bcedb1
  F src/prepare.c 931ad0d852a0df48f79adcba6ce79ca5f475625c
  F src/printf.c 4a9f882f1c1787a8b494a2987765acf9d97ac21f
  F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
- F src/resolve.c cdd546d62da7763119ea1fa455a898959e03457f
+ F src/resolve.c 521bdc0f6c7cf8246c0b9167d726d84005097c30
  F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
- F src/select.c e6daa524bbdfa98f4abdb8cb281498f0047d3161
- F src/shell.c e392dd1ccbb77cc1d75a8367a89b473c24bea019
- F src/sqlite.h.in 2be63c600ddc118753c6058639b282554d7f759c
+ F src/select.c 395e458a6dc611cbe1179f424753f0c344957607
+ F src/shell.c 11c9611580bb2ffce3a232f31f7f8cc310df0843
 -F src/sqlite.h.in 39cc33bb08897c748fe3383c29ccf56585704177
++F src/sqlite.h.in 6a7a592aacc98674f39cb520cb7a7af87c2c2438
  F src/sqlite3.rc fea433eb0a59f4c9393c8e6d76a6e2596b1fe0c0
  F src/sqlite3ext.h 6904f4aadf976f95241311fbffb00823075d9477
- F src/sqliteInt.h e08e87a07d3cbbc57423c78f56b334579ef17741
 -F src/sqliteInt.h e998703742455b2241731424c6ec142fd8d0258f
++F src/sqliteInt.h f3f74ba8e76a9a850bfc38a529e7d7ad8227d0be
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c bedc37ec1a6bb9399944024d63f4c769971955a9
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
- F src/tclsqlite.c 289be7b639406314813219ee7bc043d21f36ab12
 -F src/tclsqlite.c 5203bb7b71a302bea8896f176cd178e38d7803a4
++F src/tclsqlite.c 0faa4b56ab352368b0bffa0874de5cf5c9d89c7e
  F src/test1.c f62769c989146149590662ab02de4a813813a9c5
  F src/test2.c 4178056dd1e7d70f954ad8a1e3edb71a2a784daf
  F src/test3.c 3c3c2407fa6ec7a19e24ae23f7cb439d0275a60d
@@@ -249,12 -238,12 +250,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 85576363e303ffa5dc7d368af4cfd6bfbee96db1
 -F src/vdbe.c f51eb3207594703d24e91335cb16906e894b48aa
 -F src/vdbe.h b52887278cb173e66188da84dfab216bea61119d
 -F src/vdbeInt.h 79abf9b31be406d35ca77d6999cb2d42aaf91e78
 -F src/vdbeapi.c 4c2418161cf45392ba76a7ca92f9a5f06b96f89c
 -F src/vdbeaux.c 7658c5d9db838db5780f6a1c4d1280d0646e3569
 -F src/vdbeblob.c 32f2a4899d67f69634ea4dd93e3f651936d732cb
++F src/vdbe.c 4cf34269ba3a2f405eb4eb966c793baa07d863c0
 +F src/vdbe.h 1223e2548e0970cf96f573ff6b99f804a36ad683
 +F src/vdbeInt.h 2de43968dc47f1961d5bc76aa3cb68eacf433a7c
 +F src/vdbeapi.c 58fdcd56109c05876f69c25d47a138ef370d3647
 +F src/vdbeaux.c 0ce759dca1d1662f45f60a9336bf84b5cd15debf
 +F src/vdbeblob.c 11248c6362389569764682eb0f59ce910f3cc381
  F src/vdbemem.c cb55e84b8e2c15704968ee05f0fae25883299b74
  F src/vdbesort.c c61ca318681c0e7267da8be3abfca8469652a7e9
  F src/vdbetrace.c 8bd5da325fc90f28464335e4cc4ad1407fe30835
@@@ -662,8 -653,8 +665,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 a62f73293b0f0d79b0c87f8dd32d46fe53b0bd17
+ F test/pragma.test 5ce333cae37d86cfe9b3add840906e375e2272b0
  F test/pragma2.test 3a55f82b954242c642f8342b17dffc8b47472947
  F test/printf.test ec9870c4dce8686a37818e0bf1aba6e6a1863552
  F test/progress.test 5b075c3c790c7b2a61419bc199db87aaf48b8301
@@@ -709,8 -701,8 +713,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/server1.test 46803bd3fe8b99b30dbc5ff38ffc756f5c13a118
 +F test/session.test c1a17c11ef7d01c24fe2b9f7871190d949a8e718
  F test/shared.test 1da9dbad400cee0d93f252ccf76e1ae007a63746
  F test/shared2.test 03eb4a8d372e290107d34b6ce1809919a698e879
  F test/shared3.test ebf77f023f4bdaa8f74f65822b559e86ce5c6257
@@@ -1038,7 -1031,7 +1044,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 ba8d08b67021a32fda069c18b7eb93523e6f0d1f 92c9ab56b1c67b9468bec57ab1d2c483a69a2810
- R f06c7a4e8d9fd6f22d929caa0d8aff12
 -P 99127a669c49f82918853091c9c5b7db5ad73cba
 -R c3dfd34890a9fadadecfeeae8889e37f
++P 4f6d69ae94671df92b976525f75404c01270fef9 45c158b1a015e0295244982e7a61ecc55cca8436
++R 8d2ecc460dcc396acbf742a4b5125040
  U drh
- Z 66550b6aeab54597acd3e06f02611eed
 -Z 1e14e89eb51110980c945c9622f22c94
++Z c65bfb73ba1c154a624c7762ce7998dd

diff --cc manifest.uuid
index d2764ecec22c5e20435372602388313a9164ab50,83cfaa7c7495548881750f97b3c8712f08ffeda0..5b1f7ccacc9bf9b332a1d2e39a49dd0a6c9bf3b2
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 4f6d69ae94671df92b976525f75404c01270fef9
 -45c158b1a015e0295244982e7a61ecc55cca8436
++7e068e39b3b31364271664e0afb1cd95a235c26f

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

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/tclsqlite.c
index f1a05c9a6b3734979b216f9b0bad896e4b172cba,267f759701664ed460d17975104c812b43e511a9..070c540ecc245131c7058150d46586345a67df47
--- 1/src/tclsqlite.c
--- 2/src/tclsqlite.c
+++ b/src/tclsqlite.c
@@@ -3830,9 -3684,8 +3830,11 @@@ static void init_all(Tcl_Interp *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);
  #endif
@@@ -3875,9 -3728,8 +3877,11 @@@
      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);
  #endif

diff --cc src/vdbe.c
Simple merge