Skip to content

Commit f5c62a0

Browse files
committed
Merge branch 'sqlite-release' into integration
2 parents 946f363 + 7cffc88 commit f5c62a0

File tree

177 files changed

+21111
-2512
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

177 files changed

+21111
-2512
lines changed

Makefile.in

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ LIBOBJS0 = alter.lo analyze.lo attach.lo auth.lo \
177177
backup.lo bitvec.lo btmutex.lo btree.lo build.lo \
178178
callback.lo complete.lo ctime.lo date.lo delete.lo \
179179
expr.lo fault.lo fkey.lo \
180-
fts3.lo fts3_expr.lo fts3_hash.lo fts3_icu.lo fts3_porter.lo \
180+
fts3.lo fts3_aux.lo fts3_expr.lo fts3_hash.lo fts3_icu.lo fts3_porter.lo \
181181
fts3_snippet.lo fts3_tokenizer.lo fts3_tokenizer1.lo fts3_write.lo \
182182
func.lo global.lo hash.lo \
183183
icu.lo insert.lo journal.lo legacy.lo loadext.lo \
@@ -319,6 +319,7 @@ SRC += \
319319
$(TOP)/ext/fts3/fts3.c \
320320
$(TOP)/ext/fts3/fts3.h \
321321
$(TOP)/ext/fts3/fts3Int.h \
322+
$(TOP)/ext/fts3/fts3_aux.c \
322323
$(TOP)/ext/fts3/fts3_expr.c \
323324
$(TOP)/ext/fts3/fts3_hash.c \
324325
$(TOP)/ext/fts3/fts3_hash.h \
@@ -368,6 +369,7 @@ TESTSRC = \
368369
$(TOP)/src/test_demovfs.c \
369370
$(TOP)/src/test_devsym.c \
370371
$(TOP)/src/test_func.c \
372+
$(TOP)/src/test_fuzzer.c \
371373
$(TOP)/src/test_hexio.c \
372374
$(TOP)/src/test_init.c \
373375
$(TOP)/src/test_intarray.c \
@@ -383,10 +385,12 @@ TESTSRC = \
383385
$(TOP)/src/test_schema.c \
384386
$(TOP)/src/test_server.c \
385387
$(TOP)/src/test_superlock.c \
388+
$(TOP)/src/test_syscall.c \
386389
$(TOP)/src/test_stat.c \
387390
$(TOP)/src/test_tclvar.c \
388391
$(TOP)/src/test_thread.c \
389392
$(TOP)/src/test_vfs.c \
393+
$(TOP)/src/test_wholenumber.c \
390394
$(TOP)/src/test_wsd.c
391395

392396
# Source code to the library files needed by the test fixture
@@ -427,6 +431,7 @@ TESTSRC2 = \
427431
$(TOP)/src/where.c \
428432
parse.c \
429433
$(TOP)/ext/fts3/fts3.c \
434+
$(TOP)/ext/fts3/fts3_aux.c \
430435
$(TOP)/ext/fts3/fts3_expr.c \
431436
$(TOP)/ext/fts3/fts3_tokenizer.c \
432437
$(TOP)/ext/fts3/fts3_write.c \
@@ -831,6 +836,9 @@ fts2_tokenizer1.lo: $(TOP)/ext/fts2/fts2_tokenizer1.c $(HDR) $(EXTHDR)
831836
fts3.lo: $(TOP)/ext/fts3/fts3.c $(HDR) $(EXTHDR)
832837
$(LTCOMPILE) -DSQLITE_CORE -c $(TOP)/ext/fts3/fts3.c
833838

839+
fts3_aux.lo: $(TOP)/ext/fts3/fts3_aux.c $(HDR) $(EXTHDR)
840+
$(LTCOMPILE) -DSQLITE_CORE -c $(TOP)/ext/fts3/fts3_aux.c
841+
834842
fts3_expr.lo: $(TOP)/ext/fts3/fts3_expr.c $(HDR) $(EXTHDR)
835843
$(LTCOMPILE) -DSQLITE_CORE -c $(TOP)/ext/fts3/fts3_expr.c
836844

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.7.5
1+
3.7.6.2

art/2005osaward.gif

3.66 KB
Loading

art/SQLite.eps

23.6 KB
Binary file not shown.

art/SQLite.gif

2.99 KB
Loading

art/SQLiteLogo3.tiff

83.2 KB
Binary file not shown.

art/SQLite_big.gif

7.25 KB
Loading

art/nocopy.gif

3.37 KB
Loading

art/powered_by_sqlite.gif

3.31 KB
Loading

art/sqlite370.eps

Lines changed: 5333 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)