From: drh <drh@noemail.net>
Date: Mon, 3 Feb 2014 13:58:42 +0000 (+0000)
Subject: Sync with version 3.8.3.
X-Git-Tag: version-3.13.0~148^2~160
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4b46eb108dfaf68a5673d19acec4709416082209;p=thirdparty%2Fsqlite.git

Sync with version 3.8.3.

FossilOrigin-Name: a704b65b9476d60c88b5bc82f2743faa2bce5ac2
---

4b46eb108dfaf68a5673d19acec4709416082209
diff --cc Makefile.msc
index a7f8ee5527,8dce52b5bc..995d8cd260
--- a/Makefile.msc
+++ b/Makefile.msc
@@@ -268,10 -268,19 +268,21 @@@ TCC = $(TCC) -I$(TOP)\ext\fts
  RCC = $(RCC) -I$(TOP)\ext\fts3
  TCC = $(TCC) -I$(TOP)\ext\rtree
  RCC = $(RCC) -I$(TOP)\ext\rtree
 +TCC = $(TCC) -I$(TOP)\ext\session
 +RCC = $(RCC) -I$(TOP)\ext\session
  !ENDIF
  
+ # The mksqlite3c.tcl script accepts some options on the command
+ # line.  When compiling with debugging enabled, some of these
+ # options are necessary in order to allow debugging symbols to
+ # work correctly with Visual Studio when using the amalgamation.
+ #
+ !IF $(DEBUG)>0
+ MKSQLITE3C_ARGS = --linemacros
+ !ELSE
+ MKSQLITE3C_ARGS =
+ !ENDIF
+ 
  # Define -DNDEBUG to compile without debugging (i.e., for production usage)
  # Omitting the define will cause extra debugging code to be inserted and
  # includes extra comments when "EXPLAIN stmt" is used.
@@@ -935,10 -927,9 +946,10 @@@ mptester.exe:	$(TOP)\mptest\mptest.c li
  	echo > .target_source
  
  sqlite3.c:	.target_source $(TOP)\tool\mksqlite3c.tcl
- 	$(TCLSH_CMD) $(TOP)\tool\mksqlite3c.tcl
+ 	$(TCLSH_CMD) $(TOP)\tool\mksqlite3c.tcl $(MKSQLITE3C_ARGS)
  	copy tsrc\shell.c .
  	copy tsrc\sqlite3ext.h .
 +	copy $(TOP)\ext\session\sqlite3session.h .
  
  sqlite3-all.c:	sqlite3.c $(TOP)\tool\split-sqlite3c.tcl
  	$(TCLSH_CMD) $(TOP)\tool\split-sqlite3c.tcl
diff --cc manifest
index 7ecac84a19,e648887520..ac14cbf2d0
--- a/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\slatest\sfixes\sfrom\sthe\strunk.
- D 2014-01-29T14:21:31.405
 -C Version\s3.8.3
 -D 2014-02-03T13:52:03.248
++C Sync\swith\sversion\s3.8.3.
++D 2014-02-03T13:58:42.546
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
 +F Makefile.in e4ee6d36cdf6136aee0158675a3b24dd3bf31a5a
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc 043280f9ca15befa7236484a6c1448d9271abd73
 -F Makefile.msc 6ff3ff2eef45c7dd309a8626ff7947b20bd387e7
++F Makefile.msc 71dd5335d266351598e51f2d694396db2a2e219f
  F Makefile.vxworks db21ed42a01d5740e656b16f92cb5d8d5e5dd315
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
  F VERSION 8ed548d87d0a27fd7d7620476f9e25f9fa742d73
@@@ -751,7 -737,7 +751,7 @@@ F test/pagesize.test 1dd51367e752e742f5
  F test/pcache.test b09104b03160aca0d968d99e8cd2c5b1921a993d
  F test/pcache2.test a83efe2dec0d392f814bfc998def1d1833942025
  F test/percentile.test b98fc868d71eb5619d42a1702e9ab91718cbed54
- F test/permutations.test 79927c8175c4dc889f30486388490dae229b3b11
 -F test/permutations.test 40add071ba71aefe1c04f5845308cf46f7de8d04
++F test/permutations.test b7b8b410e3d22e616ff473e588078da6a377c082
  F test/pragma.test e882183ecd21d064cec5c7aaea174fbd36293429
  F test/pragma2.test aea7b3d82c76034a2df2b38a13745172ddc0bc13
  F test/printf.test ec9870c4dce8686a37818e0bf1aba6e6a1863552
@@@ -1167,7 -1152,10 +1167,7 @@@ F tool/vdbe-compress.tcl 0cf56e9263a152
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
  F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
- P 7b5f3773867ed0e4ed17bd473ba972d500035318 5bb29b82109224a2ad02920658fabd8fb0f27b3f
- R 432574c0dd840817debf508c99b1ccfe
- U dan
- Z 2459ddf115f614b7a3ba484263d1245a
 -P af3c775e5d6a399bfc985a5dae27451908766546
 -R d59f4c16611ef76ed43b5f579f765c07
 -T +bgcolor * #d0c0ff
 -T +sym-release *
 -T +sym-version-3.8.3 *
++P 6b6dcd4cc75317628072abac7c58b41361cc72b4 e816dd924619db5f766de6df74ea2194f3e3b538
++R 346d101c294d20bde7ae1f470938d788
+ U drh
 -Z be66093eab6507921c2b573a40e5f8d7
++Z 539f6826e36788b480b45411fb5563b3
diff --cc manifest.uuid
index d587a3dc0e,514369c84f..3dc9abc5ee
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 6b6dcd4cc75317628072abac7c58b41361cc72b4
 -e816dd924619db5f766de6df74ea2194f3e3b538
++a704b65b9476d60c88b5bc82f2743faa2bce5ac2