Skip to content

Commit 063f9cd

Browse files
sjlombardosjlombardo
committed
Merge branch 'sqlite-release' into integration
2 parents 75eeefc + 7941e18 commit 063f9cd

File tree

151 files changed

+20094
-21205
lines changed

Some content is hidden

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

151 files changed

+20094
-21205
lines changed

‎.cvsignore‎

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎Makefile.in‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ NAWK = @AWK@
175175
#
176176
OBJS0 = alter.lo analyze.lo attach.lo auth.lo backup.lo bitvec.lo btmutex.lo \
177177
btree.lo build.lo callback.lo complete.lo date.lo \
178-
delete.lo expr.lo fault.lo func.lo global.lo \
178+
delete.lo expr.lo fault.lo fkey.lo func.lo global.lo \
179179
hash.lo journal.lo insert.lo legacy.lo loadext.lo \
180180
main.lo malloc.lo mem0.lo mem1.lo mem2.lo mem3.lo mem5.lo \
181181
memjournal.lo \
@@ -219,6 +219,7 @@ SRC = \
219219
$(TOP)/src/delete.c \
220220
$(TOP)/src/expr.c \
221221
$(TOP)/src/fault.c \
222+
$(TOP)/src/fkey.c \
222223
$(TOP)/src/func.c \
223224
$(TOP)/src/global.c \
224225
$(TOP)/src/hash.c \
@@ -246,9 +247,9 @@ SRC = \
246247
$(TOP)/src/os.c \
247248
$(TOP)/src/os.h \
248249
$(TOP)/src/os_common.h \
250+
$(TOP)/src/os_os2.c \
249251
$(TOP)/src/os_unix.c \
250252
$(TOP)/src/os_win.c \
251-
$(TOP)/src/os_os2.c \
252253
$(TOP)/src/pager.c \
253254
$(TOP)/src/pager.h \
254255
$(TOP)/src/parse.y \
@@ -349,7 +350,7 @@ TESTSRC2 = \
349350
$(TOP)/src/expr.c \
350351
$(TOP)/src/func.c \
351352
$(TOP)/src/insert.c \
352-
$(TOP)/src/malloc.c \
353+
$(TOP)/src/mem5.c \
353354
$(TOP)/src/os.c \
354355
$(TOP)/src/os_os2.c \
355356
$(TOP)/src/os_unix.c \
@@ -392,17 +393,18 @@ TESTSRC = \
392393
$(TOP)/src/test_devsym.c \
393394
$(TOP)/src/test_func.c \
394395
$(TOP)/src/test_hexio.c \
396+
$(TOP)/src/test_init.c \
395397
$(TOP)/src/test_journal.c \
396398
$(TOP)/src/test_malloc.c \
397-
$(TOP)/src/test_md5.c \
398399
$(TOP)/src/test_mutex.c \
399400
$(TOP)/src/test_onefile.c \
400401
$(TOP)/src/test_osinst.c \
401402
$(TOP)/src/test_pcache.c \
402403
$(TOP)/src/test_schema.c \
403404
$(TOP)/src/test_server.c \
404405
$(TOP)/src/test_tclvar.c \
405-
$(TOP)/src/test_thread.c
406+
$(TOP)/src/test_thread.c \
407+
$(TOP)/src/test_wsd.c
406408

407409
# Header files used by all library source files.
408410
#
@@ -570,6 +572,9 @@ expr.lo: $(TOP)/src/expr.c $(HDR)
570572
fault.lo: $(TOP)/src/fault.c $(HDR)
571573
$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/fault.c
572574

575+
fkey.lo: $(TOP)/src/fkey.c $(HDR)
576+
$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/fkey.c
577+
573578
func.lo: $(TOP)/src/func.c $(HDR)
574579
$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/func.c
575580

@@ -698,9 +703,8 @@ select.lo: $(TOP)/src/select.c $(HDR)
698703
status.lo: $(TOP)/src/status.c $(HDR)
699704
$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/status.c
700705

701-
sqlite3.h: $(TOP)/src/sqlite.h.in
702-
sed -e s/--VERS--/$(RELEASE)/ $(TOP)/src/sqlite.h.in | \
703-
sed -e s/--VERSION-NUMBER--/$(VERSION_NUMBER)/ >sqlite3.h
706+
sqlite3.h: $(TOP)/src/sqlite.h.in $(TOP)/manifest.uuid $(TOP)/VERSION
707+
tclsh $(TOP)/tool/mksqlite3h.tcl $(TOP) >sqlite3.h
704708

705709
table.lo: $(TOP)/src/table.c $(HDR)
706710
$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/table.c

‎README‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -136,10 +136,15 @@ can copy and edit to suit your needs. Comments on the generic makefile
136136
show what changes are needed.
137137

138138
The linux binaries on the website are created using the generic makefile,
139-
not the configure script.
140-
The windows binaries on the website are created using MinGW32 configured
141-
as a cross-compiler running under Linux. For details, see the ./publish.sh
142-
script at the top-level of the source tree.
139+
not the configure script. The windows binaries on the website are created
140+
using MinGW32 configured as a cross-compiler running under Linux. For
141+
details, see the ./publish.sh script at the top-level of the source tree.
142+
The developers do not use teh configure script.
143+
144+
SQLite does not require TCL to run, but a TCL installation is required
145+
by the makefiles. SQLite contains a lot of generated code and TCL is
146+
used to do much of that code generation. The makefile also requires
147+
AWK.
143148

144149
Contacts:
145150

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.6.17
1+
3.6.20

‎addopcodes.awk‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ END {
1919
printf "#define TK_%-29s %4d\n", "TO_NUMERIC", ++max
2020
printf "#define TK_%-29s %4d\n", "TO_INT", ++max
2121
printf "#define TK_%-29s %4d\n", "TO_REAL", ++max
22+
printf "#define TK_%-29s %4d\n", "ISNOT", ++max
2223
printf "#define TK_%-29s %4d\n", "END_OF_FILE", ++max
2324
printf "#define TK_%-29s %4d\n", "ILLEGAL", ++max
2425
printf "#define TK_%-29s %4d\n", "SPACE", ++max
@@ -28,4 +29,6 @@ END {
2829
printf "#define TK_%-29s %4d\n", "AGG_FUNCTION", ++max
2930
printf "#define TK_%-29s %4d\n", "AGG_COLUMN", ++max
3031
printf "#define TK_%-29s %4d\n", "CONST_FUNC", ++max
32+
printf "#define TK_%-29s %4d\n", "UMINUS", ++max
33+
printf "#define TK_%-29s %4d\n", "UPLUS", ++max
3134
}

0 commit comments

Comments
 (0)