Skip to content

Commit 7941e18

Browse files
sjlombardosjlombardo
committed
track upstream 3.6.20
1 parent db1d641 commit 7941e18

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
@@ -165,7 +165,7 @@ NAWK = @AWK@
165165
#
166166
OBJS0 = alter.lo analyze.lo attach.lo auth.lo backup.lo bitvec.lo btmutex.lo \
167167
btree.lo build.lo callback.lo complete.lo date.lo \
168-
delete.lo expr.lo fault.lo func.lo global.lo \
168+
delete.lo expr.lo fault.lo fkey.lo func.lo global.lo \
169169
hash.lo journal.lo insert.lo legacy.lo loadext.lo \
170170
main.lo malloc.lo mem0.lo mem1.lo mem2.lo mem3.lo mem5.lo \
171171
memjournal.lo \
@@ -208,6 +208,7 @@ SRC = \
208208
$(TOP)/src/delete.c \
209209
$(TOP)/src/expr.c \
210210
$(TOP)/src/fault.c \
211+
$(TOP)/src/fkey.c \
211212
$(TOP)/src/func.c \
212213
$(TOP)/src/global.c \
213214
$(TOP)/src/hash.c \
@@ -235,9 +236,9 @@ SRC = \
235236
$(TOP)/src/os.c \
236237
$(TOP)/src/os.h \
237238
$(TOP)/src/os_common.h \
239+
$(TOP)/src/os_os2.c \
238240
$(TOP)/src/os_unix.c \
239241
$(TOP)/src/os_win.c \
240-
$(TOP)/src/os_os2.c \
241242
$(TOP)/src/pager.c \
242243
$(TOP)/src/pager.h \
243244
$(TOP)/src/parse.y \
@@ -338,7 +339,7 @@ TESTSRC2 = \
338339
$(TOP)/src/expr.c \
339340
$(TOP)/src/func.c \
340341
$(TOP)/src/insert.c \
341-
$(TOP)/src/malloc.c \
342+
$(TOP)/src/mem5.c \
342343
$(TOP)/src/os.c \
343344
$(TOP)/src/os_os2.c \
344345
$(TOP)/src/os_unix.c \
@@ -381,17 +382,18 @@ TESTSRC = \
381382
$(TOP)/src/test_devsym.c \
382383
$(TOP)/src/test_func.c \
383384
$(TOP)/src/test_hexio.c \
385+
$(TOP)/src/test_init.c \
384386
$(TOP)/src/test_journal.c \
385387
$(TOP)/src/test_malloc.c \
386-
$(TOP)/src/test_md5.c \
387388
$(TOP)/src/test_mutex.c \
388389
$(TOP)/src/test_onefile.c \
389390
$(TOP)/src/test_osinst.c \
390391
$(TOP)/src/test_pcache.c \
391392
$(TOP)/src/test_schema.c \
392393
$(TOP)/src/test_server.c \
393394
$(TOP)/src/test_tclvar.c \
394-
$(TOP)/src/test_thread.c
395+
$(TOP)/src/test_thread.c \
396+
$(TOP)/src/test_wsd.c
395397

396398
# Header files used by all library source files.
397399
#
@@ -554,6 +556,9 @@ expr.lo: $(TOP)/src/expr.c $(HDR)
554556
fault.lo: $(TOP)/src/fault.c $(HDR)
555557
$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/fault.c
556558

559+
fkey.lo: $(TOP)/src/fkey.c $(HDR)
560+
$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/fkey.c
561+
557562
func.lo: $(TOP)/src/func.c $(HDR)
558563
$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/func.c
559564

@@ -682,9 +687,8 @@ select.lo: $(TOP)/src/select.c $(HDR)
682687
status.lo: $(TOP)/src/status.c $(HDR)
683688
$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/status.c
684689

685-
sqlite3.h: $(TOP)/src/sqlite.h.in
686-
sed -e s/--VERS--/$(RELEASE)/ $(TOP)/src/sqlite.h.in | \
687-
sed -e s/--VERSION-NUMBER--/$(VERSION_NUMBER)/ >sqlite3.h
690+
sqlite3.h: $(TOP)/src/sqlite.h.in $(TOP)/manifest.uuid $(TOP)/VERSION
691+
tclsh $(TOP)/tool/mksqlite3h.tcl $(TOP) >sqlite3.h
688692

689693
table.lo: $(TOP)/src/table.c $(HDR)
690694
$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/table.c

‎README‎

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

2626
The linux binaries on the website are created using the generic makefile,
27-
not the configure script.
28-
The windows binaries on the website are created using MinGW32 configured
29-
as a cross-compiler running under Linux. For details, see the ./publish.sh
30-
script at the top-level of the source tree.
27+
not the configure script. The windows binaries on the website are created
28+
using MinGW32 configured as a cross-compiler running under Linux. For
29+
details, see the ./publish.sh script at the top-level of the source tree.
30+
The developers do not use teh configure script.
31+
32+
SQLite does not require TCL to run, but a TCL installation is required
33+
by the makefiles. SQLite contains a lot of generated code and TCL is
34+
used to do much of that code generation. The makefile also requires
35+
AWK.
3136

3237
Contacts:
3338

‎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)