From: drh <drh@noemail.net>
Date: Wed, 30 Mar 2011 02:03:12 +0000 (+0000)
Subject: Merge in all the latest changes from trunk.
X-Git-Tag: version-3.13.0~148^2~300
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5847b5f9c318a13a1a2a6a5f4687c16af53a1b58;p=thirdparty%2Fsqlite.git

Merge in all the latest changes from trunk.

FossilOrigin-Name: b11d941e92897663da46160185e6e305d4e28fe6
---

5847b5f9c318a13a1a2a6a5f4687c16af53a1b58
diff --cc manifest
index 263bf3c2a2,1af4f54adf..b427fcf551
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Improve\scoverage\sof\ssession\smodule\sa\sbit\smore.
- D 2011-03-25T19:06:10
 -C Add\stests\sto\ssyscall.test\sand\ssysfault.test.
 -D 2011-03-29T18:28:35.749
++C Merge\sin\sall\sthe\slatest\schanges\sfrom\strunk.
++D 2011-03-30T02:03:12.567
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 27701a1653595a1f2187dc61c8117e00a6c1d50f
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -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 b2da15b9d727d7f4e5fe95599b32b92d93b5a970
 +F ext/session/session2.test e36222e1f48bc9b1d80eacd001994d307c107e73
 +F ext/session/session3.test 919f7e2e07fa5a166a0ea5d8ac3fbe7f38f7e447
 +F ext/session/session4.test a37bc9d8891ea1f3e120056c978f66c925f040b9
 +F ext/session/session_common.tcl fb91560b6dbd086010df8b3a137a452f1ac21a28
 +F ext/session/sessionfault.test 2544a2e2ecad56e3c07a32c09799871d243c114c
 +F ext/session/sqlite3session.c 9be8ccee4248681700659b89a81ae5c6cb8afacc
 +F ext/session/sqlite3session.h f284bac51c12de0e0096fc986e61f5ae6b9e5be5
 +F ext/session/test_session.c f8fdf5c110898b2bbc20c475fca879664c77fb5a
- F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895
+ F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
- F main.mk ae0868e05c76eaa8a0ae3d6927a949b1c8e810d7
 -F main.mk 7e4d4d0433c9cbfd906c6451a7cc50310a8f4555
++F main.mk e283752f215b7055cdc48399da82033b67024e42
  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 846a91e163497b596b5bbebd26477eaf234eb1c0
 -F src/sqlite.h.in e047f69a61d604d4f8be6cf1d1bdfc68be9ba7e5
++F src/sqlite.h.in 73512de44f0d3563dd24be2e701542e52c7efe25
  F src/sqlite3ext.h c90bd5507099f62043832d73f6425d8d5c5da754
 -F src/sqliteInt.h f8f1d00a22c98fd3f2fbc94da74eeb880879f89f
 +F src/sqliteInt.h 7c11f9a648cf82e87330fd2185fcaa1f7c46dfba
  F src/sqliteLimit.h a17dcd3fb775d63b64a43a55c54cb282f9726f44
  F src/status.c 4997380fbb915426fef9e500b4872e79c99267fc
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
- F src/tclsqlite.c 78713534e628ea92b032bfa20ea8a1afc6cdb124
 -F src/tclsqlite.c b020ebf3b4af58cae7875e217efd7ac22f485713
++F src/tclsqlite.c c233c25153b6fa3b511bc65df352cb8f97a0f81d
  F src/test1.c 9020310c7617234b33fd1c3064f89524db25f290
  F src/test2.c 80d323d11e909cf0eb1b6fbb4ac22276483bcf31
  F src/test3.c 056093cfef69ff4227a6bdb9108564dc7f45e4bc
@@@ -236,15 -228,15 +237,15 @@@ F src/test_vfstrace.c 2265c9895f350c8d3
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/tokenize.c 604607d6813e9551cf5189d899e0a25c12681080
  F src/trigger.c ec4813709e990a169b6923293e839fa5dfd64282
 -F src/update.c 81911be16ece3c3e7716aa18565b4814ec41f8b9
 +F src/update.c f81e9b326cafba3fbe493141e396f3bbfba1d99b
- F src/utf.c 1baeeac91707a4df97ccc6141ec0f808278af685
+ F src/utf.c d83650c3ea08f7407bd9d0839d9885241c209c60
  F src/util.c cd997077bad039efc0597eb027c929658f93c018
  F src/vacuum.c 924bd1bcee2dfb05376f79845bd3b4cec7b54b2f
- F src/vdbe.c c90edafd941481506f001b17cd8523683fdac853
 -F src/vdbe.c e3f37ca0afdd72e883475e2a32a06167df2810d0
 -F src/vdbe.h 4de0efb4b0fdaaa900cf419b35c458933ef1c6d2
 -F src/vdbeInt.h e1c6254641168507d25b46affb6dfb53c782f553
 -F src/vdbeapi.c a09ad9164cafc505250d5dd6b69660c960f1308c
 -F src/vdbeaux.c 9211dfa7d79d94d4e50714bfd0497ff3588a739d
++F src/vdbe.c 175a42d0f12b92093a7335402dbb46bfe7e360b0
 +F src/vdbe.h edef9c4f0be83e1f1dccd049da37b40e021b63d9
 +F src/vdbeInt.h b6748a8ac9be169d83585a0f5daf747863c6b8db
 +F src/vdbeapi.c e472b3e5985175e948e70025cb3bffa8a2e185c8
- F src/vdbeaux.c af3be34b1980e428972ea11ef3a1d88acf8f2b9d
++F src/vdbeaux.c 051a1609e578418d1bfc6d2420b8eb412a7aea97
  F src/vdbeblob.c c3ccb7c8732858c680f442932e66ad06bb036562
  F src/vdbemem.c 0498796b6ffbe45e32960d6a1f5adfb6e419883b
  F src/vdbetrace.c 3ba13bc32bdf16d2bdea523245fd16736bed67b5
@@@ -680,9 -672,11 +682,11 @@@ F test/subselect.test d24fd8757daf97daf
  F test/substr.test 18f57c4ca8a598805c4d64e304c418734d843c1a
  F test/superlock.test 5d7a4954b0059c903f82c7b67867bc5451a7c082
  F test/sync.test ded6b39d8d8ca3c0c5518516c6371b3316d3e3a3
+ F test/syscall.test 125d9781d914c408e8629053b5f914dc920ab3eb
+ F test/sysfault.test be42aa42f89a82305cf3807047d419595e430480
  F test/table.test 04ba066432430657712d167ebf28080fe878d305
- F test/tableapi.test 7262a8cbaa9965d429f1cbd2747edc185fa56516
+ F test/tableapi.test 2674633fa95d80da917571ebdd759a14d9819126
 -F test/tclsqlite.test 8c154101e704170c2be10f137a5499ac2c6da8d3
 +F test/tclsqlite.test 1ce9b6340d6d412420634e129a2e3722c651056a
  F test/tempdb.test 19d0f66e2e3eeffd68661a11c83ba5e6ace9128c
  F test/temptable.test f42121a0d29a62f00f93274464164177ab1cc24a
  F test/temptrigger.test b0273db072ce5f37cf19140ceb1f0d524bbe9f05
@@@ -925,7 -919,7 +929,7 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P 666123c8d07be87d477e67b1cebef2b0fba5b4bc
- R 06396f39a2dba603f238d63a566a7e13
 -P dbe569a099c2855480e35c0cc4d9332821ad80da
 -R 3d53fb9ad6916c3f10485806a35396e6
--U dan
- Z 44bcd7637527a5a2be65b60012fc28ed
 -Z cababf145f4f0436acd3441acb25d038
++P 4255a9f609c4fd43582a0874143eabe211199726 3d2de011814002e2e25b7645f94ff8fc7aab9cdd
++R 48b479c7a408c0c8015c6f938b7e92a4
++U drh
++Z 1cd943e96dc4b8cfc7720b21a63156f8
diff --cc manifest.uuid
index 622c16332b,fd74feecd2..c6b7c703a4
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 4255a9f609c4fd43582a0874143eabe211199726
 -3d2de011814002e2e25b7645f94ff8fc7aab9cdd
++b11d941e92897663da46160185e6e305d4e28fe6
diff --cc src/tclsqlite.c
index 2d945be532,88bc8bb5dd..93c5118372
--- a/src/tclsqlite.c
+++ b/src/tclsqlite.c
@@@ -3719,10 -3581,8 +3719,10 @@@ static void init_all(Tcl_Interp *interp
      extern int Sqlitequota_Init(Tcl_Interp*);
      extern int Sqlitemultiplex_Init(Tcl_Interp*);
      extern int SqliteSuperlock_Init(Tcl_Interp*);
+     extern int SqlitetestSyscall_Init(Tcl_Interp*);
 -
 +#ifdef SQLITE_ENABLE_SESSION
 +    extern int TestSession_Init(Tcl_Interp*);
 +#endif
- 
  #ifdef SQLITE_ENABLE_ZIPVFS
      extern int Zipvfs_Init(Tcl_Interp*);
      Zipvfs_Init(interp);
@@@ -3759,9 -3619,7 +3759,10 @@@
      Sqlitequota_Init(interp);
      Sqlitemultiplex_Init(interp);
      SqliteSuperlock_Init(interp);
+     SqlitetestSyscall_Init(interp);
 +#ifdef SQLITE_ENABLE_SESSION
 +    TestSession_Init(interp);
 +#endif
  
      Tcl_CreateObjCommand(interp,"load_testfixture_extensions",init_all_cmd,0,0);