From: drh <drh@noemail.net>
Date: Sat, 23 Dec 2017 18:40:39 +0000 (+0000)
Subject: Merge recent enhancements from trunk.
X-Git-Tag: version-3.22.0~98^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=844cf56bc63fa1dba90fadac77dbdd8da19f412d;p=thirdparty%2Fsqlite.git

Merge recent enhancements from trunk.

FossilOrigin-Name: edceaccd66a65d6b36e53ce33d760a7bd9c2261a592d12189f5f55417b5d5d74
---

844cf56bc63fa1dba90fadac77dbdd8da19f412d
diff --cc Makefile.in
index 5d377174f8,009ab2e061..1b5d487895
--- a/Makefile.in
+++ b/Makefile.in
@@@ -1191,12 -1192,9 +1193,15 @@@ sqlite3_analyzer.c: sqlite3.c $(TOP)/sr
  sqlite3_analyzer$(TEXE): sqlite3_analyzer.c
  	$(LTLINK) sqlite3_analyzer.c -o $@ $(LIBTCL) $(TLIBS)
  
 +sqltclsh.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/sqltclsh.tcl $(TOP)/ext/misc/appendvfs.c $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqltclsh.c.in	
 +	$(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqltclsh.c.in >sqltclsh.c
 +
 +sqltclsh$(TEXE): sqltclsh.c
 +	$(LTLINK) sqltclsh.c -o $@ $(LIBTCL) $(TLIBS)
 +
+ sqlite3_expert$(TEXE): $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/sqlite3expert.c $(TOP)/ext/expert/expert.c sqlite3.c
+ 	$(LTLINK)	$(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/sqlite3expert.c $(TOP)/ext/expert/expert.c sqlite3.c -o sqlite3_expert $(TLIBS)
+ 
  CHECKER_DEPS =\
    $(TOP)/tool/mkccode.tcl \
    sqlite3.c \
diff --cc main.mk
index bc4e404020,8692450441..aa0bd33e33
--- a/main.mk
+++ b/main.mk
@@@ -810,12 -813,9 +814,15 @@@ sqlite3_analyzer.c: sqlite3.c $(TOP)/sr
  sqlite3_analyzer$(EXE): sqlite3_analyzer.c
  	$(TCCX) $(TCL_FLAGS) sqlite3_analyzer.c -o $@ $(LIBTCL) $(THREADLIB) 
  
 +sqltclsh.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/sqltclsh.tcl $(TOP)/ext/misc/appendvfs.c $(TOP)/tool/mkccode.tcl
 +	tclsh $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqltclsh.c.in >sqltclsh.c
 +
 +sqltclsh$(EXE): sqltclsh.c
 +	$(TCCX) $(TCL_FLAGS) sqltclsh.c -o $@ $(LIBTCL) $(THREADLIB) 
 +
+ sqlite3_expert$(EXE): $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/sqlite3expert.c $(TOP)/ext/expert/expert.c sqlite3.c
+ 	$(TCCX) -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION $(TOP)/ext/expert/sqlite3expert.c $(TOP)/ext/expert/expert.c sqlite3.c -o sqlite3_expert$(EXE) $(THREADLIB)
+ 
  CHECKER_DEPS =\
    $(TOP)/tool/mkccode.tcl \
    sqlite3.c \
diff --cc manifest
index 743670d293,f187cc0290..c5aed3eac5
--- a/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C Fixes\sto\sthe\sappendvfs.c\sextension.\s\sAdd\sthe\s"sqltclsh"\sapplication\sthat\nuses\sappendvfs.c\sto\sfind\sits\sscripts.
- D 2017-12-14T19:24:00.444
- F Makefile.in 053284f237e955fba2f386fd9f87020199e6dbcbce9f48bc02cf431458afbe07
 -C Simplification\sto\sthe\serror\shandling\slogic\sin\sthe\sextension\sloader.
 -D 2017-12-23T14:39:36.160
 -F Makefile.in ceb40bfcb30ebba8e1202b34c56ff7e13e112f9809e2381d99be32c2726058f5
++C Merge\srecent\senhancements\sfrom\strunk.
++D 2017-12-23T18:40:39.094
++F Makefile.in f2dc8c140e1d728157834da295eaaa8a0cb29620595c2a9f0efc7258797e6f24
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc a2492b29176edc3c754aa7a2f7daa20cd3fa20a56e3ee64e376092836177c42a
+ F Makefile.msc 6480671f7c129e61208d69492b3c71ce4310d49fceac83cfb17f1c081e242b69
  F README.md eeae1e552f93ef72ef7c5b8f6647b368a001c28820ad1df179d3dae602bef681
  F VERSION 0c10cdfed866fdd2d80434f64f042c3330f1daaed12e54287beb104f04b3faaf
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -396,7 -401,7 +402,7 @@@ F ext/userauth/userauth.c 3410be31283ab
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk d0278b8833203dc60ed81eed12412d90559fcd3470e0fd5d509d41ef74a3d64b
 -F main.mk 50bac9920024b5485f06398b3980f09e97ab28cd4b5b6dcd829d2a5e3ce22e7a
++F main.mk 992bddc5dc2f37faac929cabc367a89304436566eb385ab89e83d94f4107ad69
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@@ -1683,7 -1687,7 +1690,7 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 7f7b72d83633922e2b5dbf0d3455d0fea72cc6b8925ffcb78dfbad7b3c4b26e9
- R 4666f6f48678fbbcc815c221172efa48
 -P 05fee1a21ea398f1e4d6f1cf361657eff25ed6cd8f85ab398262dcfd30da57e9
 -R 7fbfe3e61eca395fa5baf5f121a4d2ad
++P ee248b529c2396c5480fb99b0a1dc31032627ec8241eca4a8c0fff257bb4a088 07c773148d8db185fa54991df09298b64f4fef28879e6c9395759265e8183977
++R 38880472a25b77bfdeb87344d5313674
  U drh
- Z 47302a3d5371e2c5e325f342d15c1218
 -Z d82d9c01768cefc5beb206b92e1398bf
++Z 5274401ef77d35314ed9b1a10cd6e401
diff --cc manifest.uuid
index dcab13a743,8454418cd5..9da9bac5e4
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- ee248b529c2396c5480fb99b0a1dc31032627ec8241eca4a8c0fff257bb4a088
 -07c773148d8db185fa54991df09298b64f4fef28879e6c9395759265e8183977
++edceaccd66a65d6b36e53ce33d760a7bd9c2261a592d12189f5f55417b5d5d74