Merge leaf created by accident.

FossilOrigin-Name: 1f680cb37584baa106cee0544d5be63049d55858

diff --cc manifest
index 673dc525b2bb366a5b5578f980c79672b788dfa1,b9a4afa44ab71dd2a95336af3f3e02a2493245cf..db42398bf07df84ea6213d5d7ee5667b574d84f6
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,8 +1,5 @@@
- C Avoid\sassuming\sthat\sthe\suser\shas\s"."\sin\stheir\spath\swhen\srunning\smulti-process\stests.
- D 2010-08-20T12:31:30
 ------BEGIN PGP SIGNED MESSAGE-----
 -Hash: SHA1
 -
 -C Do\snot\sattempt\srun\sbackwards\scompatibility\stests\sif\sno\shistorical\s\n"testfixture"\sbinaries\sare\savailable.
 -D 2010-08-20T10:28:28
++C Merge\sleaf\screated\sby\saccident.
++D 2010-08-20T12:34:00
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 543f91f24cd7fee774ecc0a61c19704c0c3e78fd
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -176,7 -179,7 +176,7 @@@ F src/sqliteInt.h e33b15e8176442bf7484f
  F src/sqliteLimit.h a17dcd3fb775d63b64a43a55c54cb282f9726f44
  F src/status.c 496913d4e8441195f6f2a75b1c95993a45b9b30b
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
--F src/tclsqlite.c 5cd96419fb6c771006f064196ccc70c29d01bec7
++F src/tclsqlite.c cacee9482417b6fc6043f6bb831ff9496d46242d
  F src/test1.c 55005c9781b157b1d215ba145768783b9abae78c
  F src/test2.c 80d323d11e909cf0eb1b6fbb4ac22276483bcf31
  F src/test3.c 4c21700c73a890a47fc685c1097bfb661346ac94
@@@ -845,7 -848,14 +845,7 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P 8d05f66db7d6e8b8916fcf22fa92159d863d2610
- R 3cb626532d96dbbd2c42f67aa60740fe
 -P 541dd3b870f123a5fddf0b710474693566a1d659
 -R 4eb7b3fde86b871098654da31a09bd98
 -U drh
 -Z 03ad677ea220cb018d8c7d6c4e495440
 ------BEGIN PGP SIGNATURE-----
 -Version: GnuPG v1.4.6 (GNU/Linux)
 -
 -iD8DBQFMbljQoxKgR168RlERArM1AJwN21jnJBboIAig9FX+ba3jM0fTkQCdGHgu
 -kFXqx+JxqN9vD3YYc0CxXdk=
 -=gv2j
 ------END PGP SIGNATURE-----
++P daa5d461b98fc068cbba52d338ca8690edd27bc9 40e11aabc7668e1c9db43d9183edb445996254bd
++R bc0dee4f394d8df90bdcb29bf2bdf710
 +U dan
- Z 1b26b23e6878cdb3ce0d4315c76a4f13
++Z f7574014cc8231579235f0f454dcfece

diff --cc manifest.uuid
index a10a2b98918facae904f26ef42755306eb078424,ae2db540e39d24356edbfebcfc1d0c1170677bf1..e5be95a08862dcd26e13b1d8179509321d178cee
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- daa5d461b98fc068cbba52d338ca8690edd27bc9
 -40e11aabc7668e1c9db43d9183edb445996254bd
++1f680cb37584baa106cee0544d5be63049d55858

diff --cc src/tclsqlite.c
index 68a44c510d53ef8ee3ac501e1e8b71c93f9be0c8,68a44c510d53ef8ee3ac501e1e8b71c93f9be0c8..5b5b4b3839f19073db98875426b172a4b5f1dc0d
--- 1/src/tclsqlite.c
--- 2/src/tclsqlite.c
+++ b/src/tclsqlite.c
@@@ -3015,7 -3015,7 +3015,7 @@@ static int DbMain(void *cd, Tcl_Interp 
  ** used to open a new SQLite database.  See the DbMain() routine above
  ** for additional information.
  */
--EXTERN int Sqlite3_Init(Tcl_Interp *interp){
++int Sqlite3_Init(Tcl_Interp *interp){
    Tcl_InitStubs(interp, "8.4", 0);
    Tcl_CreateObjCommand(interp, "sqlite3", (Tcl_ObjCmdProc*)DbMain, 0, 0);
    Tcl_PkgProvide(interp, "sqlite3", PACKAGE_VERSION);
@@@ -3023,24 -3023,24 +3023,24 @@@
    Tcl_PkgProvide(interp, "sqlite", PACKAGE_VERSION);
    return TCL_OK;
  }
--EXTERN int Tclsqlite3_Init(Tcl_Interp *interp){ return Sqlite3_Init(interp); }
--EXTERN int Sqlite3_SafeInit(Tcl_Interp *interp){ return TCL_OK; }
--EXTERN int Tclsqlite3_SafeInit(Tcl_Interp *interp){ return TCL_OK; }
--EXTERN int Sqlite3_Unload(Tcl_Interp *interp, int flags){ return TCL_OK; }
--EXTERN int Tclsqlite3_Unload(Tcl_Interp *interp, int flags){ return TCL_OK; }
--EXTERN int Sqlite3_SafeUnload(Tcl_Interp *interp, int flags){ return TCL_OK; }
--EXTERN int Tclsqlite3_SafeUnload(Tcl_Interp *interp, int flags){ return TCL_OK;}
++int Tclsqlite3_Init(Tcl_Interp *interp){ return Sqlite3_Init(interp); }
++int Sqlite3_SafeInit(Tcl_Interp *interp){ return TCL_OK; }
++int Tclsqlite3_SafeInit(Tcl_Interp *interp){ return TCL_OK; }
++int Sqlite3_Unload(Tcl_Interp *interp, int flags){ return TCL_OK; }
++int Tclsqlite3_Unload(Tcl_Interp *interp, int flags){ return TCL_OK; }
++int Sqlite3_SafeUnload(Tcl_Interp *interp, int flags){ return TCL_OK; }
++int Tclsqlite3_SafeUnload(Tcl_Interp *interp, int flags){ return TCL_OK;}
  
  
  #ifndef SQLITE_3_SUFFIX_ONLY
--EXTERN int Sqlite_Init(Tcl_Interp *interp){ return Sqlite3_Init(interp); }
--EXTERN int Tclsqlite_Init(Tcl_Interp *interp){ return Sqlite3_Init(interp); }
--EXTERN int Sqlite_SafeInit(Tcl_Interp *interp){ return TCL_OK; }
--EXTERN int Tclsqlite_SafeInit(Tcl_Interp *interp){ return TCL_OK; }
--EXTERN int Sqlite_Unload(Tcl_Interp *interp, int flags){ return TCL_OK; }
--EXTERN int Tclsqlite_Unload(Tcl_Interp *interp, int flags){ return TCL_OK; }
--EXTERN int Sqlite_SafeUnload(Tcl_Interp *interp, int flags){ return TCL_OK; }
--EXTERN int Tclsqlite_SafeUnload(Tcl_Interp *interp, int flags){ return TCL_OK;}
++int Sqlite_Init(Tcl_Interp *interp){ return Sqlite3_Init(interp); }
++int Tclsqlite_Init(Tcl_Interp *interp){ return Sqlite3_Init(interp); }
++int Sqlite_SafeInit(Tcl_Interp *interp){ return TCL_OK; }
++int Tclsqlite_SafeInit(Tcl_Interp *interp){ return TCL_OK; }
++int Sqlite_Unload(Tcl_Interp *interp, int flags){ return TCL_OK; }
++int Tclsqlite_Unload(Tcl_Interp *interp, int flags){ return TCL_OK; }
++int Sqlite_SafeUnload(Tcl_Interp *interp, int flags){ return TCL_OK; }
++int Tclsqlite_SafeUnload(Tcl_Interp *interp, int flags){ return TCL_OK;}
  #endif
  
  #ifdef TCLSH