SQLite: Check-in [63ebcb52]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview

Comment:	Fix so that the TCL test harness works even if SQLITE_ENABLE_FTS is omitted.
Downloads:	Tarball \| ZIP archive \| SQL archive
Timelines:	family \| ancestors \| descendants \| both \| broken-build
Files:	files \| file ages \| folders
SHA1:	63ebcb52a1909aca80f2fef3e982f8fb5929b73b
User & Date:	drh 2011-06-15 13:02:21

Context

2011-06-15
13:11		Merge the improved incremental doclist loading test from the broken-build branch (which is now fixed) into trunk. check-in: f9750870 user: drh tags: trunk
13:02		Fix so that the TCL test harness works even if SQLITE_ENABLE_FTS is omitted. Closed-Leaf check-in: 63ebcb52 user: drh tags: broken-build
12:43		Fix a couple of compiler warnings. check-in: 3899f3b9 user: drh tags: broken-build

Changes

Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to ext/fts3/fts3_test.c.

   269    269   */
   270    270   static int fts3_configure_incr_load_cmd(
   271    271     ClientData clientData,
   272    272     Tcl_Interp *interp,
   273    273     int objc,
   274    274     Tcl_Obj *CONST objv[]
   275    275   ){
          276  +#ifdef SQLITE_ENABLE_FTS3
   276    277     extern int test_fts3_node_chunksize;
   277    278     extern int test_fts3_node_chunk_threshold;
   278    279     int iArg1;
   279    280     int iArg2;
   280    281     Tcl_Obj *pRet;
   281    282   
   282    283     if( objc!=1 && objc!=3 ){
................................................................................
   302    303       }
   303    304       test_fts3_node_chunksize = iArg1;
   304    305       test_fts3_node_chunk_threshold = iArg2;
   305    306     }
   306    307   
   307    308     Tcl_SetObjResult(interp, pRet);
   308    309     Tcl_DecrRefCount(pRet);
          310  +#endif
   309    311     return TCL_OK;
   310    312   }
   311    313   
   312    314   int Sqlitetestfts3_Init(Tcl_Interp *interp){
   313    315     Tcl_CreateObjCommand(interp, "fts3_near_match", fts3_near_match_cmd, 0, 0);
   314    316     Tcl_CreateObjCommand(interp, 
   315    317         "fts3_configure_incr_load", fts3_configure_incr_load_cmd, 0, 0
   316    318     );
   317    319     return TCL_OK;
   318    320   }
   319         -