Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Avoid including fts3_term.c in the amalgamation, as it contains test code only. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
f392b7ae0266b4c694836583cb91b10f |
| User & Date: | dan 2011-05-17 14:41:36 |
Context
|
2011-05-17
| ||
| 15:21 | Avoid exceeding array bounds when reading a corrupt database file in autovacuum mode. Fixes a problem discovered by John Regehr and Peng Li using a customized clang compiler. check-in: f7c525f5 user: drh tags: trunk | |
| 14:41 | Avoid including fts3_term.c in the amalgamation, as it contains test code only. check-in: f392b7ae user: dan tags: trunk | |
|
2011-05-16
| ||
| 21:00 | Enhance WAL mode so that the WAL file honors the journal size limit set by PRAGMA journal_size_limit. check-in: db7e500f user: drh tags: trunk | |
Changes
Changes to Makefile.in.
162 162 # Object files for the SQLite library (non-amalgamation). 163 163 # 164 164 LIBOBJS0 = alter.lo analyze.lo attach.lo auth.lo \ 165 165 backup.lo bitvec.lo btmutex.lo btree.lo build.lo \ 166 166 callback.lo complete.lo ctime.lo date.lo delete.lo \ 167 167 expr.lo fault.lo fkey.lo \ 168 168 fts3.lo fts3_aux.lo fts3_expr.lo fts3_hash.lo fts3_icu.lo fts3_porter.lo \ 169 - fts3_snippet.lo fts3_term.lo fts3_tokenizer.lo fts3_tokenizer1.lo fts3_write.lo \ 169 + fts3_snippet.lo fts3_tokenizer.lo fts3_tokenizer1.lo fts3_write.lo \ 170 170 func.lo global.lo hash.lo \ 171 171 icu.lo insert.lo journal.lo legacy.lo loadext.lo \ 172 172 main.lo malloc.lo mem0.lo mem1.lo mem2.lo mem3.lo mem5.lo \ 173 173 memjournal.lo \ 174 174 mutex.lo mutex_noop.lo mutex_os2.lo mutex_unix.lo mutex_w32.lo \ 175 175 notify.lo opcodes.lo os.lo os_os2.lo os_unix.lo os_win.lo \ 176 176 pager.lo parse.lo pcache.lo pcache1.lo pragma.lo prepare.lo printf.lo \ ................................................................................ 309 309 $(TOP)/ext/fts3/fts3_aux.c \ 310 310 $(TOP)/ext/fts3/fts3_expr.c \ 311 311 $(TOP)/ext/fts3/fts3_hash.c \ 312 312 $(TOP)/ext/fts3/fts3_hash.h \ 313 313 $(TOP)/ext/fts3/fts3_icu.c \ 314 314 $(TOP)/ext/fts3/fts3_porter.c \ 315 315 $(TOP)/ext/fts3/fts3_snippet.c \ 316 - $(TOP)/ext/fts3/fts3_term.c \ 317 316 $(TOP)/ext/fts3/fts3_tokenizer.h \ 318 317 $(TOP)/ext/fts3/fts3_tokenizer.c \ 319 318 $(TOP)/ext/fts3/fts3_tokenizer1.c \ 320 319 $(TOP)/ext/fts3/fts3_write.c 321 320 SRC += \ 322 321 $(TOP)/ext/icu/sqliteicu.h \ 323 322 $(TOP)/ext/icu/icu.c ................................................................................ 375 374 $(TOP)/src/test_superlock.c \ 376 375 $(TOP)/src/test_syscall.c \ 377 376 $(TOP)/src/test_stat.c \ 378 377 $(TOP)/src/test_tclvar.c \ 379 378 $(TOP)/src/test_thread.c \ 380 379 $(TOP)/src/test_vfs.c \ 381 380 $(TOP)/src/test_wholenumber.c \ 382 - $(TOP)/src/test_wsd.c 381 + $(TOP)/src/test_wsd.c \ 382 + $(TOP)/ext/fts3/fts3_term.c 383 383 384 384 # Source code to the library files needed by the test fixture 385 385 # 386 386 TESTSRC2 = \ 387 387 $(TOP)/src/attach.c \ 388 388 $(TOP)/src/backup.c \ 389 389 $(TOP)/src/bitvec.c \ ................................................................................ 832 832 833 833 fts3_porter.lo: $(TOP)/ext/fts3/fts3_porter.c $(HDR) $(EXTHDR) 834 834 $(LTCOMPILE) -DSQLITE_CORE -c $(TOP)/ext/fts3/fts3_porter.c 835 835 836 836 fts3_snippet.lo: $(TOP)/ext/fts3/fts3_snippet.c $(HDR) $(EXTHDR) 837 837 $(LTCOMPILE) -DSQLITE_CORE -c $(TOP)/ext/fts3/fts3_snippet.c 838 838 839 -fts3_term.lo: $(TOP)/ext/fts3/fts3_term.c $(HDR) $(EXTHDR) 840 - $(LTCOMPILE) -DSQLITE_CORE -c $(TOP)/ext/fts3/fts3_term.c 841 - 842 839 fts3_tokenizer.lo: $(TOP)/ext/fts3/fts3_tokenizer.c $(HDR) $(EXTHDR) 843 840 $(LTCOMPILE) -DSQLITE_CORE -c $(TOP)/ext/fts3/fts3_tokenizer.c 844 841 845 842 fts3_tokenizer1.lo: $(TOP)/ext/fts3/fts3_tokenizer1.c $(HDR) $(EXTHDR) 846 843 $(LTCOMPILE) -DSQLITE_CORE -c $(TOP)/ext/fts3/fts3_tokenizer1.c 847 844 848 845 fts3_write.lo: $(TOP)/ext/fts3/fts3_write.c $(HDR) $(EXTHDR)
Changes to ext/fts3/fts3Int.h.
377 377 /* fts3_expr.c */ 378 378 int sqlite3Fts3ExprParse(sqlite3_tokenizer *, 379 379 char **, int, int, const char *, int, Fts3Expr ** 380 380 ); 381 381 void sqlite3Fts3ExprFree(Fts3Expr *); 382 382 #ifdef SQLITE_TEST 383 383 int sqlite3Fts3ExprInitTestInterface(sqlite3 *db); 384 +int sqlite3Fts3InitTerm(sqlite3 *db); 384 385 #endif 385 386 386 387 /* fts3_aux.c */ 387 388 int sqlite3Fts3InitAux(sqlite3 *db); 388 389 389 390 #endif /* _FTSINT_H */
Changes to main.mk.
50 50 51 51 # Object files for the SQLite library. 52 52 # 53 53 LIBOBJ+= alter.o analyze.o attach.o auth.o \ 54 54 backup.o bitvec.o btmutex.o btree.o build.o \ 55 55 callback.o complete.o ctime.o date.o delete.o expr.o fault.o fkey.o \ 56 56 fts3.o fts3_aux.o fts3_expr.o fts3_hash.o fts3_icu.o fts3_porter.o \ 57 - fts3_snippet.o fts3_term.o fts3_tokenizer.o fts3_tokenizer1.o \ 57 + fts3_snippet.o fts3_tokenizer.o fts3_tokenizer1.o \ 58 58 fts3_write.o func.o global.o hash.o \ 59 59 icu.o insert.o journal.o legacy.o loadext.o \ 60 60 main.o malloc.o mem0.o mem1.o mem2.o mem3.o mem5.o \ 61 61 memjournal.o \ 62 62 mutex.o mutex_noop.o mutex_os2.o mutex_unix.o mutex_w32.o \ 63 63 notify.o opcodes.o os.o os_os2.o os_unix.o os_win.o \ 64 64 pager.o parse.o pcache.o pcache1.o pragma.o prepare.o printf.o \ ................................................................................ 190 190 $(TOP)/ext/fts3/fts3_aux.c \ 191 191 $(TOP)/ext/fts3/fts3_expr.c \ 192 192 $(TOP)/ext/fts3/fts3_hash.c \ 193 193 $(TOP)/ext/fts3/fts3_hash.h \ 194 194 $(TOP)/ext/fts3/fts3_icu.c \ 195 195 $(TOP)/ext/fts3/fts3_porter.c \ 196 196 $(TOP)/ext/fts3/fts3_snippet.c \ 197 - $(TOP)/ext/fts3/fts3_term.c \ 198 197 $(TOP)/ext/fts3/fts3_tokenizer.h \ 199 198 $(TOP)/ext/fts3/fts3_tokenizer.c \ 200 199 $(TOP)/ext/fts3/fts3_tokenizer1.c \ 201 200 $(TOP)/ext/fts3/fts3_write.c 202 201 SRC += \ 203 202 $(TOP)/ext/icu/sqliteicu.h \ 204 203 $(TOP)/ext/icu/icu.c ................................................................................ 480 479 481 480 fts3_icu.o: $(TOP)/ext/fts3/fts3_icu.c $(HDR) $(EXTHDR) 482 481 $(TCCX) -DSQLITE_CORE -c $(TOP)/ext/fts3/fts3_icu.c 483 482 484 483 fts3_snippet.o: $(TOP)/ext/fts3/fts3_snippet.c $(HDR) $(EXTHDR) 485 484 $(TCCX) -DSQLITE_CORE -c $(TOP)/ext/fts3/fts3_snippet.c 486 485 487 -fts3_term.o: $(TOP)/ext/fts3/fts3_term.c $(HDR) $(EXTHDR) 488 - $(TCCX) -DSQLITE_CORE -c $(TOP)/ext/fts3/fts3_term.c 489 - 490 486 fts3_porter.o: $(TOP)/ext/fts3/fts3_porter.c $(HDR) $(EXTHDR) 491 487 $(TCCX) -DSQLITE_CORE -c $(TOP)/ext/fts3/fts3_porter.c 492 488 493 489 fts3_tokenizer.o: $(TOP)/ext/fts3/fts3_tokenizer.c $(HDR) $(EXTHDR) 494 490 $(TCCX) -DSQLITE_CORE -c $(TOP)/ext/fts3/fts3_tokenizer.c 495 491 496 492 fts3_tokenizer1.o: $(TOP)/ext/fts3/fts3_tokenizer1.c $(HDR) $(EXTHDR)
Changes to tool/mksqlite3c.tcl.
294 294 notify.c 295 295 296 296 fts3.c 297 297 fts3_aux.c 298 298 fts3_expr.c 299 299 fts3_hash.c 300 300 fts3_porter.c 301 - fts3_term.c 302 301 fts3_tokenizer.c 303 302 fts3_tokenizer1.c 304 303 fts3_write.c 305 304 fts3_snippet.c 306 305 307 306 rtree.c 308 307 icu.c 309 308 fts3_icu.c 310 309 } { 311 310 copy_file tsrc/$file 312 311 } 313 312 314 313 close $out