Merge branch 'master' into sqlite-3.7.16.2

Conflicts:
	mutex.h
	os.h
	os_win.c
	resolve.c
	shell.c
	sqlite3.h
	sqliteint.h
	util.c

.gitignore

@@ -0,0 +1,9 @@
+.\$ADF\$*
+.\$NFS\$*
+*\;*
+*-*/*
+*.jou
+*.tex
+*.dvi_*
+*.int_*
+*.tc[befi]

descrip.mms

@@ -0,0 +1,202 @@
+!
+! 2013 March 9
+!
+! The author disclaims copyright to this source code.  In place of
+! a legal notice, here is a blessing:
+!
+!    May you do good and not evil.
+!    May you find forgiveness for yourself and forgive others.
+!    May you share freely, never taking more than you give.
+!
+!***********************************************************************
+! Build description file for OpenVMS VAX, Alpha and I64 version of 
+! SQLite.
+!
+.IF "$(MMSARCH_NAME)" .EQ "Alpha"
+ARCH = AXP
+.ELSIF "$(MMSARCH_NAME)" .EQ "IA64"
+ARCH = I64
+.ELSIF "$(MMSARCH_NAME)" .EQ "VAX"
+ARCH = VAX
+.ELSE
+.ERROR You must define the ARCH macro as one of: VAX, AXP or I64
+.ENDIF
+
+MG_FACILITY = SQLITE3
+.IFDEF __MADGOAT_BUILD__
+BINDIR = MG_BIN:[$(MG_FACILITY)]
+ETCDIR = MG_ETC:[$(MG_FACILITY)]
+KITDIR = MG_KIT:[$(MG_FACILITY)]
+SRCDIR = MG_SRC:[$(MG_FACILITY)]
+.ELSE
+BINDIR = SYS$DISK:[.BIN-$(ARCH)]
+ETCDIR = SYS$DISK:[.ETC-$(ARCH)]
+KITDIR = SYS$DISK:[.KIT-$(ARCH)]
+SRCDIR = SYS$DISK:[]
+.ENDIF
+
+.FIRST
+.IFDEF __VAX__
+    @ IF (F$SEARCH("SYS$COMMON:[GCC]LOGIN.COM") .NES. "") THEN -
+       @SYS$COMMON:[GCC]LOGIN
+    @ IF (F$SEARCH("SYS$COMMON:[GCC]LOGIN.COM") .EQS. "") THEN -
+       WRITE SYS$OUTPUT "%F, this software will not build without GCC for VAX"
+.ENDIF
+    @ IF F$PARSE("$(BINDIR)") .EQS. "" THEN CREATE/DIR $(BINDIR)
+    @ DEFINE/NOLOG BIN_DIR $(BINDIR)
+    @ IF F$PARSE("$(ETCDIR)") .EQS. "" THEN CREATE/DIR $(ETCDIR)
+    @ DEFINE/NOLOG ETC_DIR $(ETCDIR)
+    @ IF F$PARSE("$(KITDIR)") .EQS. "" THEN CREATE/DIR $(KITDIR)
+    @ DEFINE/NOLOG KIT_DIR $(KITDIR)
+    @ DEFINE/NOLOG SRC_DIR $(SRCDIR)
+
+MUNG = EDIT/TECO/EXECUTE=
+
+OPT = .$(ARCH)_OPT
+CFLAGS = $(CFLAGS)/NAME=AS_IS
+
+.IFDEF __VAX__
+CC = GCC
+CFLAGS = $(CFLAGS)/OPT=2/SCAN=$(ETCDIR)CONFIG.H
+MFLAGS = $(MFLAGS)/NAMES=DEFINITIONS=BOTH
+VEC = $(BINDIR)SQLITE3_VECTOR.OBJ,$(BINDIR)SQLITE3_ALIASES.OBJ
+{$(SRCDIR)}.C{$(BINDIR)}.OBJ :
+    $(CC)$(CFLAGS) $(MMS$SOURCE)
+LINKFLAGS = $(LINKFLAGS)/NOSYSSHR/NOSYSLIB
+.ELSE
+CFLAGS = $(CFLAGS)/WARN=DISABLE=(LONGEXTERN,EMPTYFILE) -
+	 /FIRST_INCLUDE=$(ETCDIR)CONFIG.H/FLOAT=IEEE_FLOAT
+VEC = $(SRCDIR)SQLITE3_VECTOR$(OPT)
+{$(SRCDIR)}.C{$(BINDIR)}.OBJ :
+    $(CC)$(CFLAGS) $(MMS$SOURCE)+SYS$LIBRARY:SYS$LIB_C/LIB
+
+.ENDIF
+
+OBJECTS = $(BINDIR)ALTER.OBJ,$(BINDIR)ANALYZE.OBJ,$(BINDIR)ATTACH.OBJ,-
+	  $(BINDIR)AUTH.OBJ,$(BINDIR)BACKUP.OBJ,$(BINDIR)BITVEC.OBJ,-
+	  $(BINDIR)BTMUTEX.OBJ,$(BINDIR)BTREE.OBJ,$(BINDIR)BUILD.OBJ,-
+	  $(BINDIR)CALLBACK.OBJ,$(BINDIR)COMPLETE.OBJ,$(BINDIR)CTIME.OBJ,-
+	  $(BINDIR)DATE.OBJ,$(BINDIR)DELETE.OBJ,$(BINDIR)EXPR.OBJ,-
+	  $(BINDIR)FAULT.OBJ,$(BINDIR)FKEY.OBJ,$(BINDIR)FTS3.OBJ,-
+	  $(BINDIR)FTS3_AUX.OBJ,$(BINDIR)FTS3_EXPR.OBJ,-
+	  $(BINDIR)FTS3_HASH.OBJ,$(BINDIR)FTS3_PORTER.OBJ,-
+	  $(BINDIR)FTS3_SNIPPET.OBJ,$(BINDIR)FTS3_TOKENIZER.OBJ,-
+	  $(BINDIR)FTS3_TOKENIZER1.OBJ,$(BINDIR)FTS3_WRITE.OBJ,-
+	  $(BINDIR)FUNC.OBJ,$(BINDIR)GLOBAL.OBJ,$(BINDIR)HASH.OBJ,-
+	  $(BINDIR)INSERT.OBJ,$(BINDIR)JOURNAL.OBJ,$(BINDIR)LEGACY.OBJ,-
+	  $(BINDIR)LOADEXT.OBJ,$(BINDIR)MAIN.OBJ,$(BINDIR)MALLOC.OBJ,-
+	  $(BINDIR)MEMJOURNAL.OBJ,$(BINDIR)MEMVMS.OBJ,$(BINDIR)MUTEX.OBJ,-
+	  $(BINDIR)MUTEX_NOOP.OBJ,$(BINDIR)MUTEX_VMS.OBJ,-
+	  $(BINDIR)NOTIFY.OBJ,$(BINDIR)OPCODES.OBJ,-
+	  $(BINDIR)OS.OBJ,$(BINDIR)OS_VMS.OBJ,$(BINDIR)PAGER.OBJ,-
+	  $(BINDIR)PARSE.OBJ,$(BINDIR)PCACHE.OBJ,$(BINDIR)PCACHE1.OBJ,-
+	  $(BINDIR)PRAGMA.OBJ,$(BINDIR)PREPARE.OBJ,$(BINDIR)PRINTF.OBJ,-
+	  $(BINDIR)RANDOM.OBJ,$(BINDIR)RESOLVE.OBJ,$(BINDIR)ROWSET.OBJ,-
+	  $(BINDIR)RTREE.OBJ,$(BINDIR)SELECT.OBJ,$(BINDIR)STATUS.OBJ,-
+	  $(BINDIR)TABLE.OBJ,$(BINDIR)TOKENIZE.OBJ,$(BINDIR)TRIGGER.OBJ,-
+	  $(BINDIR)UPDATE.OBJ,$(BINDIR)UTF.OBJ,$(BINDIR)UTIL.OBJ,-
+	  $(BINDIR)VACUUM.OBJ,$(BINDIR)VDBE.OBJ,$(BINDIR)VDBEAPI.OBJ,-
+	  $(BINDIR)VDBEAUX.OBJ,$(BINDIR)VDBEBLOB.OBJ,$(BINDIR)VDBEMEM.OBJ,-
+	  $(BINDIR)VDBESORT.OBJ,$(BINDIR)VDBETRACE.OBJ,$(BINDIR)VTAB.OBJ,-
+	  $(BINDIR)WAL.OBJ,$(BINDIR)WALKER.OBJ,$(BINDIR)WHERE.OBJ
+
+$(BINDIR)SQLITE3.EXE : $(ETCDIR)CONFIG.H,-
+		       $(BINDIR)SHELL.OBJ,$(BINDIR)VMSSHELL.OBJ,-
+		       $(BINDIR)SQLITE3_SHR.EXE,-
+		       $(SRCDIR)SQLITE3$(OPT),$(ETCDIR)VERSION.OPT
+    < DEFINE/USER SQLITE3_SHR BIN_DIR:SQLITE3_SHR.EXE
+    $(LINK)$(LINKFLAGS)/EXE=$(MMS$TARGET)/NOTRACEBACK/MAP=$(ETCDIR)-
+	/CROSS/FULL $(SRCDIR)SQLITE3$(OPT)/OPT,$(ETCDIR)VERSION.OPT/OPT
+
+$(BINDIR)SQLITE3_SHR.EXE : $(ETCDIR)CONFIG.H,-
+			   $(BINDIR)SQLITE3.OLB($(OBJECTS)),$(VEC),-
+			   $(SRCDIR)SQLITE3_SHR$(OPT),$(ETCDIR)VERSION.OPT
+    $(LINK)/SHARE=$(MMS$TARGET)/MAP=$(ETCDIR)/CROSS/FULL-
+	$(SRCDIR)SQLITE3_SHR$(OPT)/OPT,$(ETCDIR)VERSION.OPT/OPT,-
+	$(SRCDIR)SQLITE3_VECTOR$(OPT)/OPT
+
+$(ETCDIR)VERSION.OPT : $(SRCDIR)SQLITE3.H
+    @MAKE_VERSION $(MMS$SOURCE) $(MMS$TARGET)
+
+$(BINDIR)SQLITE3_VECTOR.OBJ	: $(SRCDIR)SQLITE3_VECTOR.MAR
+$(BINDIR)SQLITE3_ALIASES.OBJ	: $(SRCDIR)SQLITE3_ALIASES.S
+    GAS -h 3 -o $(MMS$TARGET) $(MMS$SOURCE)
+
+$(ETCDIR)CONFIG.H : $(SRCDIR)DESCRIP.MMS
+    @ CLOSE/NOLOG S3P
+    @ OPEN/WRITE S3P ETC_DIR:CONFIG.H
+    @ WRITE S3P "#define SQLITE_OMIT_WAL 1"
+    @ WRITE S3P "#define SQLITE_DEFAULT_PAGE_SIZE 512"
+    @ WRITE S3P "#define SQLITE_DEFAULT_SECTOR_SIZE 512"
+    @ WRITE S3P "#define SQLITE_ENABLE_ATOMIC_WRITE 1"
+    @ WRITE S3P "#define SQLITE_THREADSAFE 1"
+    @ WRITE S3P "#undef SQLITE_MUTEX_NOOP"
+    @ WRITE S3P "#define SQLITE_FILE_FORMAT 4"
+    @ WRITE S3P "#define SQLITE_ENABLE_LOCKING_STYLE 0"
+    @ WRITE S3P "#define SQLITE_DISABLE_LFS 1"
+    @ WRITE S3P "#define SQLITE_CORE 1"
+    @ WRITE S3P "#define SQLITE_OMIT_UTF16 1"
+    @ WRITE S3P "#define SQLITE_SOUNDEX 1"
+    @ WRITE S3P "#define SQLITE_ENABLE_STAT2 1"
+    @ WRITE S3P "#define SQLITE_ENABLE_RTREE 1"
+    @ WRITE S3P "#define SQLITE_ENABLE_COLUMN_METADATA 1"
+    @ WRITE S3P "#define SQLITE_DEFAULT_FOREIGN_KEYS 1"
+    @ WRITE S3P "#define SQLITE_ENABLE_FTS3 1"
+    @ WRITE S3P "#define SQLITE_ENABLE_FTS3_PARENTHESIS 1"
+    @ WRITE S3P "#ifndef SQLITE_API"
+    @ WRITE S3P "# define SQLITE_API"
+    @ WRITE S3P "#endif"
+    @ CLOSE/NOLOG S3P
+    @ TYPE $(MMS$TARGET)
+
+!
+! Generate intermediate symbol vector...
+!
+.IFNDEF __VAX__
+.IF "$(FINDSTRING VECTOR,$(MMSTARGETS))" .EQ "VECTOR"
+$(SRCDIR)SYMBOL_VECTOR.TXT : $(SRCDIR)SQLITE3.H,-
+			      $(SRCDIR)MAKE_SYMBOL_VECTOR.TEC
+    $(LIBR)/LIST=$(ETCDIR)SQLITE3.LIS/NAMES $(BINDIR)SQLITE3.OLB/OBJECT
+    $(MUNG) MAKE_SYMBOL_VECTOR.TEC -
+	"$(SRCDIR)SYMBOL_VECTOR.TXT=$(ETCDIR)SQLITE3.LIS"
+
+VECTOR : $(SRCDIR)SYMBOL_VECTOR.TXT
+    @ CONTINUE
+.ELSE
+$(SRCDIR)SYMBOL_VECTOR.TXT :
+    @ CONTINUE ! do we need message about possible rebuild with VECTOR target
+.ENDIF
+.ELSE
+$(SRCDIR)SYMBOL_VECTOR.TXT :
+    @ WRITE SYS$OUTPUT "SYMBOL_VECTOR.TXT cannot be built on a VAX, yet..."
+.ENDIF
+
+!
+! VAX-specific transfer vector construction
+!
+$(SRCDIR)SQLITE3_VECTOR.MAR : $(SRCDIR)SYMBOL_VECTOR.TXT,-
+			      $(SRCDIR)MAKE_VAX_VECTOR.TEC
+    $(MUNG) MAKE_VAX_VECTOR.TEC -
+	"$(MMS$TARGET)=$(MMS$SOURCE) $(SRCDIR)SQLITE3_ALIASES.S"
+
+!
+! Alpha/I64-specific transfer vector construction
+!
+$(SRCDIR)SQLITE3_VECTOR.AXP_OPT : $(SRCDIR)SYMBOL_VECTOR.TXT,-
+			          $(SRCDIR)MAKE_LINKER_VECTOR.TEC
+    $(MUNG) MAKE_LINKER_VECTOR.TEC "$(MMS$TARGET)=$(MMS$SOURCE)"
+
+$(SRCDIR)SQLITE3_VECTOR.I64_OPT : $(SRCDIR)SQLITE3_VECTOR.AXP_OPT
+    COPY $(MMS$SOURCE) $(MMS$TARGET)
+
+$(SRCDIR)MAKE_SYMBOL_VECTOR.TEC : $(SRCDIR)MAKE_SYMBOL_VECTOR.TES
+    $(MUNG) $(SRCDIR)SQU.TEC "/L:Y/B:Y/T:Y/C:Y/A:Y $(MMS$TARGET)=$(MMS$SOURCE)"
+$(SRCDIR)MAKE_LINKER_VECTOR.TEC : $(SRCDIR)MAKE_LINKER_VECTOR.TES
+    $(MUNG) $(SRCDIR)SQU.TEC "/L:Y/B:Y/T:Y/C:Y/A:Y $(MMS$TARGET)=$(MMS$SOURCE)"
+$(SRCDIR)MAKE_VAX_VECTOR.TEC : $(SRCDIR)MAKE_VAX_VECTOR.TES
+    $(MUNG) $(SRCDIR)SQU.TEC "/L:Y/B:Y/T:Y/C:Y/A:Y $(MMS$TARGET)=$(MMS$SOURCE)"
+
+CLEAN :
+    - DELETE/NOLOG $(BINDIR)*.*;*
+    - DELETE/NOLOG $(ETCDIR)*.*;*
+    - DELETE/NOLOG $(KITDIR)*.*;*

make_linker_vector.tec

@@ -0,0 +1,35 @@
+!***********************************************************************!
+
MAKE_LINKER_VECTOR  V1.0
13100JZ"N<FS^ES ;>0J0A-32"ED'ZJ-1A-32"E
+-D''HXZHK[SUS[SEDUS[SEHUS[SESUS[SEVUS[SETUS[SEUUS[S00ED2EH0ES0EV
+2#16#128#512#8192ET-1EUEI
+@D$.U.PZJ.U.Z/32/16+1900\I /32&15U.M-1%.M"EIJanuaryOGOTMON'
+-1%.M"EIFebruaryOGOTMON'-1%.M"EIMarchOGOTMON'-1%.M"EIApril 
+OGOTMON'-1%.M"EIMayOGOTMON'-1%.M"EIJuneOGOTMON'-1%.M"EIJuly 
+OGOTMON'-1%.M"EIAugustOGOTMON'-1%.M"EISeptemberOGOTMON'-1%.M"E
+IOctoberOGOTMON'-1%.M"EINovemberOGOTMON'IDecember!GOTMON!I  
+&31+100\3RDZJQ.Z,.X0Q.Z,.KQ.PJ$
+GZ0JZ"N<FS^ES ;>XYZ0J0A-32"ED'ZJ-1A-32"E-D'0J<0A:YC0A-="E
+C0;'>.,ZXX'
...Loading existing symbol vector table...
:QX"NHK
+:ER^EQX"S:EY'0JHXTHK
done...
1310|
unable to open 
:GX
...
1310'
+:QT"N
...Generating Linker Options Symbol Vector...
I!13I10IMDI!  
+G013I10II!
+! The author disclaims copyright to this source code.  In place of
+! a legal notice, here is a blessing:
+!
+!    May you do good and not evil.
+!    May you find forgiveness for yourself and forgive others.
+!    May you share freely, never taking more than you give.
+!
+!***********************************************************************
+! This is automatically generated by MAKE_SYMBOL_VECTOR. DO NOT EDIT!!!
+!
+CASE_SENSITIVE=YES
+0U.P<ISYMBOL_VECTOR = (32<.L.U<Q.PQT:.LQ.PQT"VQ.PQT- :.U|
+Q.PQT:.U'%.PQT-,"EI-13I10I3%.PQ.PQT-S"EI    SPARE,- ! G.L13I 
+10II    SPARE,|Q.PQT-D"EI    G.LI=DATA,-13I10II    G.UI/G.L
+I=DATA,|I    G.LI=PROCEDURE,-13I10II    G.UI/G.LI=PROCEDURE,''
+<%.PQT-10"E0;'>%.P0;'>:QT-Q.P"E0;'>-DI)13I10I:QT-Q.P"E0;'>
+ICASE_SENSITIVE=NO
+:EW^EQY/STM"SHPEF
done...
1310|
Could not open vector file 
:GY13
+10''
+]SQSEU]SQSET]SQSEV]SQSES]SQSEH]SQSED]SQS]S