fts2 support for testing. These are a prelude to adding some test

scripts. (CVS 3480)

FossilOrigin-Name: 004ad1943f8c5933ee9584a57b2de9d421470d3c

diff --git a/manifest b/manifest
index a88f5511d227f9f4455eb0b853fce487b6a27474..291cad65aedb35fdd0b66e1c40e1608d882bb2c2 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C When\sconverting\sUTF8\sor\sUTF16\sstrings,\schange\soverlong\sstrings\sand\sother\nillegal\scodes\sto\s0xFFFD.\s\sTicket\s#2029.\s(CVS\s3479)
-D 2006-10-19T01:58:44
+C fts2\ssupport\sfor\stesting.\s\sThese\sare\sa\sprelude\sto\sadding\ssome\stest\nscripts.\s(CVS\s3480)
+D 2006-10-19T20:27:59
 F Makefile.in 4379c909d46b38b8c5db3533084601621d4f14b2
 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -72,7 +72,7 @@ F src/hash.h 1b3f7e2609141fd571f62199fc38687d262e9564
 F src/insert.c e9526ced19978a55687b55faea969b6ff2a53fb4
 F src/legacy.c 2631df6a861f830d6b1c0fe92b9fdd745b2c0cd6
 F src/loadext.c ab9b7fc502078a93f97161d28b4aac6ae2aad793
-F src/main.c b9cf8dd198b0463b3de8954744e7cac6a1218126
+F src/main.c 646deaa19e367fa8f3ace8b2e4577a53b1461d85
 F src/md5.c c5fdfa5c2593eaee2e32a5ce6c6927c986eaf217
 F src/os.c 59f05de8c5777c34876607114a2fbe55ae578235
 F src/os.h 3fd6a022bafd620fdfd779a51dccb42f31c97f75
@@ -100,7 +100,7 @@ F src/sqlite3ext.h 2c2156cc32a158e2b7bd9042d42accf94bff2e40
 F src/sqliteInt.h 637ef229c3d8e0f98096ab31c496efdf5361d678
 F src/table.c 6d0da66dde26ee75614ed8f584a1996467088d06
 F src/tclsqlite.c e029f739bed90071789fe81a226d53e97a80a4d8
-F src/test1.c 47f1d62d90fbf131dc5bbcd1b1aa18791fa3bc79
+F src/test1.c 20ca02cba62082b58a5e59f1278632dbd32024a1
 F src/test2.c ca74a1d8aeb7d9606e8f6b762c5daf85c1a3f92b
 F src/test3.c 85135c09560c48bdb0a23c9b890ab405486b8ec9
 F src/test4.c 8b784cd82de158a2317cb4ac4bc86f91ad315e25
@@ -410,7 +410,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P ee4894b49995e4904db1991281563cfbb7b1c16d
-R f570c2492328855150d4a5def15ee9fe
-U drh
-Z 452bce4bb83169559d00576edd9e29b4
+P 0c6736df9cb4c3c8f6224e30df939cead9cd5369
+R 6f03c99cca7b9f6d813febccbed3ae0f
+U shess
+Z f6697812d050381edc7e4ca50f45486e

diff --git a/manifest.uuid b/manifest.uuid
index 6a52d9169721d404e0adb5ab00bdb071a3873011..26d5aa78f19c67abce54939144cee9df5acca53a 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0c6736df9cb4c3c8f6224e30df939cead9cd5369
\ No newline at end of file
+004ad1943f8c5933ee9584a57b2de9d421470d3c
\ No newline at end of file

diff --git a/src/main.c b/src/main.c
index 8b2663d0b46fcef41d1be8d7d0f4c4b4245e33da..86093bbd331aeccb64c9230b02887f3e2368bb62 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -14,7 +14,7 @@
 ** other files are for internal use by SQLite and should not be
 ** accessed by users of the library.
 **
-** $Id: main.c,v 1.358 2006/09/16 21:45:14 drh Exp $
+** $Id: main.c,v 1.359 2006/10/19 20:27:59 shess Exp $
 */
 #include "sqliteInt.h"
 #include "os.h"
@@ -951,6 +951,13 @@ static int openDatabase(
   }
 #endif
 
+#ifdef SQLITE_ENABLE_FTS2
+  {
+    extern int sqlite3Fts2Init(sqlite3*);
+    sqlite3Fts2Init(db);
+  }
+#endif
+
 opendb_out:
   if( SQLITE_NOMEM==(rc = sqlite3_errcode(db)) ){
     sqlite3_close(db);

diff --git a/src/test1.c b/src/test1.c
index b9dce6b993104af6e4b6204fb771c954f4355cb2..92ecab83fc502f1275da0035ce0ac0c6449f4aca 100644 (file)
--- a/src/test1.c
+++ b/src/test1.c
@@ -13,7 +13,7 @@
 ** is not included in the SQLite library.  It is used for automated
 ** testing of the SQLite library.
 **
-** $Id: test1.c,v 1.222 2006/09/15 07:28:51 drh Exp $
+** $Id: test1.c,v 1.223 2006/10/19 20:27:59 shess Exp $
 */
 #include "sqliteInt.h"
 #include "tcl.h"
@@ -3617,6 +3617,12 @@ static void set_options(Tcl_Interp *interp){
   Tcl_SetVar2(interp, "sqlite_options", "fts1", "0", TCL_GLOBAL_ONLY);
 #endif
 
+#ifdef SQLITE_ENABLE_FTS2
+  Tcl_SetVar2(interp, "sqlite_options", "fts2", "1", TCL_GLOBAL_ONLY);
+#else
+  Tcl_SetVar2(interp, "sqlite_options", "fts2", "0", TCL_GLOBAL_ONLY);
+#endif
+
 #ifdef SQLITE_OMIT_GLOBALRECOVER
   Tcl_SetVar2(interp, "sqlite_options", "globalrecover", "0", TCL_GLOBAL_ONLY);
 #else