Merge the latest changes of trunk into the session branch.

FossilOrigin-Name: 95d53c44320b9639f2623aa9cc88d0d3e1a3be8f

diff --cc main.mk
Simple merge

diff --cc manifest
index 081ea45a189e296f0b4bd5ec28d806ccdba05f42,65800fd981d7d46f373891a777e8a52d6044be8b..b8cb6b4d46f405102de9102401402d70569d5b8a
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,7 -1,7 +1,7 @@@
- C Merge\slatest\strunk\schanges.
- D 2011-04-01T15:43:40.999
 -C Move\sthe\sexpired-statement\stest\sfor\sOP_Function\suntil\safter\sall\smemory\shas\nbeen\sfreed.\s\sThe\stest\sis\sstill\scommented\sout,\showever.
 -D 2011-04-04T12:29:20.265
++C Merge\sthe\slatest\schanges\sof\strunk\sinto\sthe\ssession\sbranch.
++D 2011-04-04T13:19:36.696
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 27701a1653595a1f2187dc61c8117e00a6c1d50f
+ F Makefile.in 7a4d9524721d40ef9ee26f93f9bd6a51dba106f2
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
  F Makefile.vxworks c85ec1d8597fe2f7bc225af12ac1666e21379151
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
@@@ -99,18 -99,9 +99,18 @@@ 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 7a92a2a6f531aef1e9764ffb7f983fb8b315376d
 +F ext/session/session2.test c3e5f78d5eb988e35cc2ba9ce3678f706283cfdb
 +F ext/session/session3.test bfa2376db7cbb2ac69496f84d93a8d81b13110d3
 +F ext/session/session4.test a6ed685da7a5293c5d6f99855bcf41dbc352ca84
 +F ext/session/session_common.tcl fb91560b6dbd086010df8b3a137a452f1ac21a28
 +F ext/session/sessionfault.test 2544a2e2ecad56e3c07a32c09799871d243c114c
 +F ext/session/sqlite3session.c 2b2936b5188776b33bba1263f93267f3ec9d0d84
 +F ext/session/sqlite3session.h f284bac51c12de0e0096fc986e61f5ae6b9e5be5
 +F ext/session/test_session.c 82e3fd7d94f485ea63bcfb15d636c95a01db97a9
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
- F main.mk e283752f215b7055cdc48399da82033b67024e42
 -F main.mk bd4e376deea4704b2bd9c77a4e6f0fa3de25c495
++F main.mk f942406cb7df55d1aec40a88a7ae399b730cd94f
  F mkdll.sh 7d09b23c05d56532e9d44a50868eb4b12ff4f74a
  F mkextu.sh 416f9b7089d80e5590a29692c9d9280a10dbad9f
  F mkextw.sh 4123480947681d9b434a5e7b1ee08135abe409ac
@@@ -187,13 -178,13 +187,13 @@@ F src/resolve.c 1c0f32b64f8e3f555fe1f73
  F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
  F src/select.c d24406c45dd2442eb2eeaac413439066b149c944
  F src/shell.c 9dc0b4bb59290c0a35256d278cab0f314987ad6a
 -F src/sqlite.h.in e047f69a61d604d4f8be6cf1d1bdfc68be9ba7e5
 +F src/sqlite.h.in 235300cdca517ce148385d3ab816e7e8cf9e1ff3
  F src/sqlite3ext.h c90bd5507099f62043832d73f6425d8d5c5da754
- F src/sqliteInt.h 14325fe41ee564f064adacda02ab64837fa905c4
 -F src/sqliteInt.h d45b0b1db417d5308e3bf9c8983aaf2d06e7cd36
++F src/sqliteInt.h bb9e764799e8c48ca547fbd1ddc3978aeb035bc5
  F src/sqliteLimit.h a17dcd3fb775d63b64a43a55c54cb282f9726f44
  F src/status.c 4997380fbb915426fef9e500b4872e79c99267fc
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
- F src/tclsqlite.c 8376ae45f7e28d521ad708a0086771fab3c96475
 -F src/tclsqlite.c 501c9a200fd998a268be475be5858febc90b725b
++F src/tclsqlite.c fe0da0eb0ebd8d21eec90683b779456e64351de6
  F src/test1.c 9ca440e80e16e53920904a0a5ac7feffb9b2c9a1
  F src/test2.c 80d323d11e909cf0eb1b6fbb4ac22276483bcf31
  F src/test3.c 056093cfef69ff4227a6bdb9108564dc7f45e4bc
@@@ -241,11 -235,11 +244,11 @@@ F src/update.c 3f3f3bb734a0da1dffd0ed33
  F src/utf.c d83650c3ea08f7407bd9d0839d9885241c209c60
  F src/util.c cd997077bad039efc0597eb027c929658f93c018
  F src/vacuum.c 924bd1bcee2dfb05376f79845bd3b4cec7b54b2f
- F src/vdbe.c 4784ded3d2c97f8084a17cacbeea490a0dccf75e
 -F src/vdbe.c 6488f759929602cbc3acea5e9c7c10e2d2cd00ed
 -F src/vdbe.h 4de0efb4b0fdaaa900cf419b35c458933ef1c6d2
 -F src/vdbeInt.h 7e2f028ecc1a9faa6f253e7aa8d89cae03662bae
 -F src/vdbeapi.c a09ad9164cafc505250d5dd6b69660c960f1308c
 -F src/vdbeaux.c 010e4e67a5a577451b0220ea8903c9e279a43248
++F src/vdbe.c e4afe80d602eb2e59d384e7e8e7cb19b06858bde
 +F src/vdbe.h edef9c4f0be83e1f1dccd049da37b40e021b63d9
- F src/vdbeInt.h b6748a8ac9be169d83585a0f5daf747863c6b8db
++F src/vdbeInt.h 36dddc4cc333867d27f00d326e29af30062a102a
 +F src/vdbeapi.c 7ef519083e3420bf7793d8b4eae2961d894d98ab
- F src/vdbeaux.c 0dcfffca621c534d8c64abfc47888dca5dd7b809
++F src/vdbeaux.c 15eff6a3202145a54e7a6e65374652045ece3545
  F src/vdbeblob.c c3ccb7c8732858c680f442932e66ad06bb036562
  F src/vdbemem.c 0498796b6ffbe45e32960d6a1f5adfb6e419883b
  F src/vdbetrace.c 3ba13bc32bdf16d2bdea523245fd16736bed67b5
@@@ -486,7 -480,8 +489,8 @@@ F test/fuzz2.test 207d0f9d06db3eaf47a6b
  F test/fuzz3.test aec64345184d1662bd30e6a17851ff659d596dc5
  F test/fuzz_common.tcl a87dfbb88c2a6b08a38e9a070dabd129e617b45b
  F test/fuzz_malloc.test dd7001ac86d09c154a7dff064f4739c60e2b312c
 -F test/hook.test f04c3412463f8ec117c1c704c74ca0f627ce733a
+ F test/fuzzer1.test 3105b5a89a6cb0d475f0877debec942fe4143462
 +F test/hook.test 040cf2ca263f192c66b358e095138dad0a9d75bb
  F test/icu.test 70df4faca133254c042d02ae342c0a141f2663f4
  F test/in.test 19b642bb134308980a92249750ea4ce3f6c75c2d
  F test/in2.test 5d4c61d17493c832f7d2d32bef785119e87bde75
@@@ -930,8 -924,9 +934,9 @@@ F tool/speedtest16.c c8a9c793df96db7e49
  F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
+ F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P f87bfe6e12093e5958b658a49d3766fb29562cbb d9707ef8dcd29667b6d366897f6ad02c87aa0041
- R e5326ee14e908456b763c8934a17defb
- U dan
- Z 5580ee572f02ed202a1934709ea63a74
 -P 4e996f36c73c5e768a954394fcbbf5e17576c807
 -R 4c64876ffe2c0a670add1f1b62152ed8
++P d184cf00574b52b93f1f089025d6a0addca57558 425e3edb146c497817855dd741878709a25c8b98
++R ffd652e7771374b0d07d334e1f6024f2
+ U drh
 -Z badc0ef9dd3fcc800ebaf4f50ec0d36c
++Z 333cd8aa259ea963e7224b1b34eb509c

diff --cc manifest.uuid
index da86ff7b09868a3f81a8f96b1972fa7973fee5ba,3a4413c91a396cd4c6d4d83d55fb83a76282dbc2..5524b4073a96b88a1e278c89ffdf5a2ac47997f2
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- d184cf00574b52b93f1f089025d6a0addca57558
 -425e3edb146c497817855dd741878709a25c8b98
++95d53c44320b9639f2623aa9cc88d0d3e1a3be8f

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/tclsqlite.c
index de0e992bd46561cbdc79cee0893e675c67f9c52a,575651d7e561d11c8e54280377b72ff6bddd75ec..e1f451541bbca737d89239fdeee488cf9af93999
--- 1/src/tclsqlite.c
--- 2/src/tclsqlite.c
+++ b/src/tclsqlite.c
@@@ -3728,9 -3582,9 +3728,11 @@@ 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
  #ifdef SQLITE_ENABLE_ZIPVFS
      extern int Zipvfs_Init(Tcl_Interp*);
      Zipvfs_Init(interp);
@@@ -3768,9 -3622,8 +3770,11 @@@
      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
  
      Tcl_CreateObjCommand(interp,"load_testfixture_extensions",init_all_cmd,0,0);
  

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbeInt.h
index 911c29faf5bf86bb8a6034992ebffef12df0cfcf,15e4a812a74098dbf8879678be1024f2e5a31dc6..05136cbeb99d80bd204ea2158c76349006c68e6e
--- 1/src/vdbeInt.h
--- 2/src/vdbeInt.h
+++ b/src/vdbeInt.h
@@@ -406,8 -387,9 +406,11 @@@ int sqlite3VdbeCloseStatement(Vdbe *, i
  void sqlite3VdbeFrameDelete(VdbeFrame*);
  int sqlite3VdbeFrameRestore(VdbeFrame *);
  void sqlite3VdbeMemStoreType(Mem *pMem);
 +void sqlite3VdbePreUpdateHook(
 +    Vdbe *, VdbeCursor *, int, const char*, Table *, i64, int);
+ void sqlite3VdbeEnter(Vdbe*);
+ void sqlite3VdbeLeave(Vdbe*);
+ void sqlite3VdbeMutexResync(Vdbe*);
  
  #ifdef SQLITE_DEBUG
  void sqlite3VdbeMemPrepareToChange(Vdbe*,Mem*);

diff --cc src/vdbeaux.c
Simple merge