From: dan <dan@noemail.net>
Date: Mon, 20 Jun 2011 11:17:11 +0000 (+0000)
Subject: (no comment)
X-Git-Tag: version-3.13.0~148^2~272
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=467eb01caa841f93c1d6c25f0fc192f052343dbe;p=thirdparty%2Fsqlite.git

(no comment)

FossilOrigin-Name: 699b884383f735fb9630d87d25dab61c97dc4485
---

467eb01caa841f93c1d6c25f0fc192f052343dbe
diff --cc manifest
index ffa65232b3,bc116c5db3..b3627525f0
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\sthe\slatest\strunk\schanges\sinto\sthe\ssessions\sbranch.
- D 2011-06-20T10:44:10.301
 -C Fix\sa\sproblem\swhere\sFTS\stest\scode\swas\snot\sbeing\sincluded\sin\sthe\stestfixture\sbuild\swhen\sSQLITE_ENABLE_FTS4\swas\sdefined.
 -D 2011-06-20T11:15:06.397
++C (no\scomment)
++D 2011-06-20T11:17:11.686
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in c1d7a7f4fd8da6b1815032efca950e3d5125407e
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -197,7 -187,7 +197,7 @@@ F src/sqliteInt.h 928caa40080d47e8f92e1
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac64842c86cec2fc1a1d0e5c16d3beb8ad332bf
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
- F src/tclsqlite.c 761d9d7a7b79a41d5a237e6c5c350a1c719ec983
 -F src/tclsqlite.c c124d55e3e7d156c0fcc62c7f9906de8451547dc
++F src/tclsqlite.c 2c9ac84e46f9753e05dff1f1bfc745a390ebeb64
  F src/test1.c efca486a25fb894988e7a82e84579a4e57388a02
  F src/test2.c 80d323d11e909cf0eb1b6fbb4ac22276483bcf31
  F src/test3.c 124ff9735fb6bb7d41de180d6bac90e7b1509432
@@@ -957,7 -946,7 +957,7 @@@ F tool/split-sqlite3c.tcl d9be87f1c3402
  F tool/symbols.sh bc2a3709940d47c8ac8e0a1fdf17ec801f015a00
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings.sh 347d974d143cf132f953b565fbc03026f19fcb4d
- P 832886b1e6edb916d9824924c7d88202f4eb1969 228c43c726e637daadc0c9b5a8b24243f239b1cf
- R 425dc88cb473dc3555e5dfae20be1cc8
- U drh
- Z d13f89a0688fa26bf060c192253dab5c
 -P d138b0e65953c529619d64e662bdb5478d7d79c3
 -R 3d60296c03d3d0e2521fbba8cb89cf3f
++P 4c5e276c902e0b93cfc05bf2e1db966ecdac0ed0 e539d08a4dda073dc67dc39a104f89374d3bd8e9
++R f0476f177016b146d1b12f97f172f0c0
+ U dan
 -Z 36fbe60e74554514c6ed759d1d5c5a4c
++Z 9b9916cabe28f8e3dca16fc079f9fb31
diff --cc manifest.uuid
index 4ffebda9e6,9a1cc9d18c..f28dccb162
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 4c5e276c902e0b93cfc05bf2e1db966ecdac0ed0
 -e539d08a4dda073dc67dc39a104f89374d3bd8e9
++699b884383f735fb9630d87d25dab61c97dc4485
diff --cc src/tclsqlite.c
index 10d73ad8d2,0e712f7d3f..1bda78b30b
--- a/src/tclsqlite.c
+++ b/src/tclsqlite.c
@@@ -3730,10 -3584,8 +3730,10 @@@ 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
- #ifdef SQLITE_ENABLE_FTS3
+ #if defined(SQLITE_ENABLE_FTS3) || defined(SQLITE_ENABLE_FTS4)
      extern int Sqlitetestfts3_Init(Tcl_Interp *interp);
  #endif
  
@@@ -3776,10 -3628,8 +3776,10 @@@
      SqlitetestSyscall_Init(interp);
      Sqlitetestfuzzer_Init(interp);
      Sqlitetestwholenumber_Init(interp);
 -
 +#if defined(SQLITE_ENABLE_SESSION) && defined(SQLITE_ENABLE_PREUPDATE_HOOK)
 +    TestSession_Init(interp);
 +#endif
- #ifdef SQLITE_ENABLE_FTS3
+ #if defined(SQLITE_ENABLE_FTS3) || defined(SQLITE_ENABLE_FTS4)
      Sqlitetestfts3_Init(interp);
  #endif