track upstream 3.6.20

Makefile.in

@@ -165,7 +165,7 @@ NAWK = @AWK@
 #
 OBJS0 = alter.lo analyze.lo attach.lo auth.lo backup.lo bitvec.lo btmutex.lo \
         btree.lo build.lo callback.lo complete.lo date.lo \
-        delete.lo expr.lo fault.lo func.lo global.lo \
+        delete.lo expr.lo fault.lo fkey.lo func.lo global.lo \
         hash.lo journal.lo insert.lo legacy.lo loadext.lo \
         main.lo malloc.lo mem0.lo mem1.lo mem2.lo mem3.lo mem5.lo \
         memjournal.lo \
@@ -208,6 +208,7 @@ SRC = \
   $(TOP)/src/delete.c \
   $(TOP)/src/expr.c \
   $(TOP)/src/fault.c \
+  $(TOP)/src/fkey.c \
   $(TOP)/src/func.c \
   $(TOP)/src/global.c \
   $(TOP)/src/hash.c \
@@ -235,9 +236,9 @@ SRC = \
   $(TOP)/src/os.c \
   $(TOP)/src/os.h \
   $(TOP)/src/os_common.h \
+  $(TOP)/src/os_os2.c \
   $(TOP)/src/os_unix.c \
   $(TOP)/src/os_win.c \
-  $(TOP)/src/os_os2.c \
   $(TOP)/src/pager.c \
   $(TOP)/src/pager.h \
   $(TOP)/src/parse.y \
@@ -338,7 +339,7 @@ TESTSRC2 = \
   $(TOP)/src/expr.c \
   $(TOP)/src/func.c \
   $(TOP)/src/insert.c \
-  $(TOP)/src/malloc.c \
+  $(TOP)/src/mem5.c \
   $(TOP)/src/os.c \
   $(TOP)/src/os_os2.c \
   $(TOP)/src/os_unix.c \
@@ -381,17 +382,18 @@ TESTSRC = \
   $(TOP)/src/test_devsym.c \
   $(TOP)/src/test_func.c \
   $(TOP)/src/test_hexio.c \
+  $(TOP)/src/test_init.c \
   $(TOP)/src/test_journal.c \
   $(TOP)/src/test_malloc.c \
-  $(TOP)/src/test_md5.c \
   $(TOP)/src/test_mutex.c \
   $(TOP)/src/test_onefile.c \
   $(TOP)/src/test_osinst.c \
   $(TOP)/src/test_pcache.c \
   $(TOP)/src/test_schema.c \
   $(TOP)/src/test_server.c \
   $(TOP)/src/test_tclvar.c \
-  $(TOP)/src/test_thread.c
+  $(TOP)/src/test_thread.c \
+  $(TOP)/src/test_wsd.c
 
 # Header files used by all library source files.
 #
@@ -554,6 +556,9 @@ expr.lo:	$(TOP)/src/expr.c $(HDR)
 fault.lo:	$(TOP)/src/fault.c $(HDR)
 	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/fault.c
 
+fkey.lo:	$(TOP)/src/fkey.c $(HDR)
+	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/fkey.c
+
 func.lo:	$(TOP)/src/func.c $(HDR)
 	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/func.c
 
@@ -682,9 +687,8 @@ select.lo:	$(TOP)/src/select.c $(HDR)
 status.lo:	$(TOP)/src/status.c $(HDR)
 	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/status.c
 
-sqlite3.h:	$(TOP)/src/sqlite.h.in 
-	sed -e s/--VERS--/$(RELEASE)/ $(TOP)/src/sqlite.h.in | \
-	sed -e s/--VERSION-NUMBER--/$(VERSION_NUMBER)/ >sqlite3.h
+sqlite3.h:	$(TOP)/src/sqlite.h.in $(TOP)/manifest.uuid $(TOP)/VERSION
+	tclsh $(TOP)/tool/mksqlite3h.tcl $(TOP) >sqlite3.h
 
 table.lo:	$(TOP)/src/table.c $(HDR)
 	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/table.c

README

@@ -24,10 +24,15 @@ can copy and edit to suit your needs.  Comments on the generic makefile
 show what changes are needed.
 
 The linux binaries on the website are created using the generic makefile,
-not the configure script.
-The windows binaries on the website are created using MinGW32 configured
-as a cross-compiler running under Linux.  For details, see the ./publish.sh
-script at the top-level of the source tree.
+not the configure script.  The windows binaries on the website are created
+using MinGW32 configured as a cross-compiler running under Linux.  For 
+details, see the ./publish.sh script at the top-level of the source tree.
+The developers do not use teh configure script.
+
+SQLite does not require TCL to run, but a TCL installation is required
+by the makefiles.  SQLite contains a lot of generated code and TCL is
+used to do much of that code generation.  The makefile also requires
+AWK.
 
 Contacts:
 

VERSION

@@ -1 +1 @@
-3.6.17
+3.6.20

addopcodes.awk

@@ -19,6 +19,7 @@ END {
   printf "#define TK_%-29s %4d\n", "TO_NUMERIC",      ++max
   printf "#define TK_%-29s %4d\n", "TO_INT",          ++max
   printf "#define TK_%-29s %4d\n", "TO_REAL",         ++max
+  printf "#define TK_%-29s %4d\n", "ISNOT",           ++max
   printf "#define TK_%-29s %4d\n", "END_OF_FILE",     ++max
   printf "#define TK_%-29s %4d\n", "ILLEGAL",         ++max
   printf "#define TK_%-29s %4d\n", "SPACE",           ++max
@@ -28,4 +29,6 @@ END {
   printf "#define TK_%-29s %4d\n", "AGG_FUNCTION",    ++max
   printf "#define TK_%-29s %4d\n", "AGG_COLUMN",      ++max
   printf "#define TK_%-29s %4d\n", "CONST_FUNC",      ++max
+  printf "#define TK_%-29s %4d\n", "UMINUS",          ++max
+  printf "#define TK_%-29s %4d\n", "UPLUS",           ++max
 }