From: drh <drh@noemail.net>
Date: Thu, 19 Nov 2015 19:31:33 +0000 (+0000)
Subject: Merge the latest enhancements from trunk.
X-Git-Tag: version-3.20.0~165^2~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=99a1ab7ebcb7b2a675e3a197d813b6df5083a802;p=thirdparty%2Fsqlite.git

Merge the latest enhancements from trunk.

FossilOrigin-Name: 8aede091c4740511d11ea14da253fe39bbfe75a6
---

99a1ab7ebcb7b2a675e3a197d813b6df5083a802
diff --cc ext/lsm1/Makefile
index 2ce8831074,0000000000..37511ef978
mode 100644,000000..100644
--- a/ext/lsm1/Makefile
+++ b/ext/lsm1/Makefile
@@@ -1,34 -1,0 +1,34 @@@
 +#!/usr/bin/make
 +#
 +# This is a temporary makefile for use during experimental development.
 +# Replace with something more portable, if the experiments actually work out.
 +#
 +CC     = gcc
- CFLAGS =-g -fPIC -Wall -I. -I/home/drh/sqlite/bld
++CFLAGS =-g -fPIC -Wall -I. -I../..
 +
 +LSMOBJ    = \
 +  lsm_ckpt.o \
 +  lsm_file.o \
 +  lsm_log.o \
 +  lsm_main.o \
 +  lsm_mem.o \
 +  lsm_mutex.o \
 +  lsm_shared.o \
 +  lsm_sorted.o \
 +  lsm_str.o \
 +  lsm_tree.o \
 +  lsm_unix.o \
 +  lsm_varint.o \
 +  lsm_vtab.o
 +
 +LSMHDR   = \
 +  lsm.h \
 +  lsmInt.h
 +
 +all: lsm.so
 +
 +lsm.so:	$(LSMOBJ)
 +	$(CC) $(CFLAGS) -shared -o lsm.so $(LSMOBJ)
 +
 +%.o:	%.c $(LSMHDR)
 +	$(CC) $(CFLAGS) -c $<
diff --cc manifest
index 7f7120c7c5,d831f3f7cd..af5d4531d2
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Work\stoward\smore\sflexible\styping\sfor\skeys\sand\svalues.
- D 2015-11-19T19:27:07.806
 -C Fix\sproblems\swith\sthe\sway\sthe\sIsHiddenColumn()\smacro\sis\sdefined.
 -D 2015-11-19T18:11:20.451
++C Merge\sthe\slatest\senhancements\sfrom\strunk.
++D 2015-11-19T19:31:33.352
  F Makefile.in d828db6afa6c1fa060d01e33e4674408df1942a1
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc e928e68168df69b353300ac87c10105206653a03
@@@ -190,22 -190,6 +190,22 @@@ F ext/fts5/tool/showfts5.tcl d54da0e067
  F ext/icu/README.txt d9fbbad0c2f647c3fdf715fc9fd64af53aedfc43
  F ext/icu/icu.c b2732aef0b076e4276d9b39b5a33cec7a05e1413
  F ext/icu/sqliteicu.h 728867a802baa5a96de7495e9689a8e01715ef37
- F ext/lsm1/Makefile f8d8f229fbeafa5352edab5be7e722ed71233b12
++F ext/lsm1/Makefile 9eed37365e0df2fe58a3011c6aacc4646f22a4ef
 +F ext/lsm1/lsm.h 0f6f64ff071471cb87bf98beb8386566f30ea001
 +F ext/lsm1/lsmInt.h bc270dd81b3355c7410b06a6d54dd3eb9493a3e8
 +F ext/lsm1/lsm_ckpt.c e7907e782fe2e95de0833675e35e726e487cc4cd
 +F ext/lsm1/lsm_file.c 63796f5741422064b146cfbffbaeaeda14b70175
 +F ext/lsm1/lsm_log.c 5b3e855fcfb85de9fb86fcbf65696cc6886d3231
 +F ext/lsm1/lsm_main.c f52eada2910f8a57bd4cafcee39c6c375f6b7ed8
 +F ext/lsm1/lsm_mem.c 4c51ea9fa285ee6e35301b33491642d071740a0a
 +F ext/lsm1/lsm_mutex.c 378edf0a2b142b4f7640ee982df06d50b98788ea
 +F ext/lsm1/lsm_shared.c 54cc3a5157c6abd77f7d3ae60708b9f7bf022b3c
 +F ext/lsm1/lsm_sorted.c 4a9e3ffecda87b379ed757b59c9cbcd84a80b55c
 +F ext/lsm1/lsm_str.c 77ebdd5040ddf267a6f724d4c83132d2dce8a226
 +F ext/lsm1/lsm_tree.c 5d9fb2bc58a1a70c75126bd8d7198f7b627e165b
 +F ext/lsm1/lsm_unix.c fcaf5b6738713f1229dc0e1a90393ecf24f787f2
 +F ext/lsm1/lsm_varint.c b19ae9bd26b5a1e8402fb8a564b25d9542338a41
 +F ext/lsm1/lsm_vtab.c 37be4d5928de455f752fdd8108ea1e6cd06ce6e0
  F ext/misc/amatch.c a1a8f66c29d40bd71b075546ddeddb477b17a2bb
  F ext/misc/closure.c 0d2a038df8fbae7f19de42e7c7d71f2e4dc88704
  F ext/misc/compress.c 122faa92d25033d6c3f07c39231de074ab3d2e83
@@@ -1419,7 -1404,7 +1420,7 @@@ F tool/vdbe_profile.tcl 246d0da094856d7
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P aa129c51ecf5c917cfac30be330886f8a10f49e1
- R 0be85f8175b37708c20cac5856fe94dc
 -P 13995756ad8b80568aa2f74387788a8cab1123ef
 -R 7d5fbb49b212de9edfd34eb075dc8992
++P 5c79f53131a7ab3c83f49e35a5021a6cdb2518fc 126b998cf163dcdd5a222634f1e929f04db3c700
++R 3aa36152d0afbf358fe2d9294f027d01
  U drh
- Z 35d0ab7ac6da941b099070286c057861
 -Z bc25bafe8827ab2ba48c52405ca8c198
++Z a2d9cb37921cba70bc9062c45a920229
diff --cc manifest.uuid
index 61047cebc0,3e5e242be0..b7d676b362
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 5c79f53131a7ab3c83f49e35a5021a6cdb2518fc
 -126b998cf163dcdd5a222634f1e929f04db3c700
++8aede091c4740511d11ea14da253fe39bbfe75a6