From: dan <dan@noemail.net>
Date: Sat, 21 Mar 2015 07:16:44 +0000 (+0000)
Subject: Merge recent trunk changes with this branch.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3d01ec5d6d7cfec689670e0d2a14ca773e37af36;p=thirdparty%2Fsqlite.git

Merge recent trunk changes with this branch.

FossilOrigin-Name: 35eef4ddd5010b869ed6daa5017caebc79d0b3fa
---

3d01ec5d6d7cfec689670e0d2a14ca773e37af36
diff --cc manifest
index c5457ca941,537a662c65..c2661fb282
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Disable\sthe\ssorter\soptimization\sused\sby\sINSERT\sINTO\sSELECT\sstatements\sif\sthe\sstatement\sexplicitly\sspecifies\sREPLACE,\sIGNORE\sor\sFAIL\sconflict\shandling.
- D 2015-03-21T07:03:55.769
 -C Correctly\sdetect\sthe\serror\sof\shaving\sa\s"*"\swildcard\son\sa\sSELECT\swithout\na\sFROM\sclause\son\sthe\sleft-hand\sside\sof\sa\srecursive\sCTE.
 -D 2015-03-21T03:18:22.783
++C Merge\srecent\strunk\schanges\swith\sthis\sbranch.
++D 2015-03-21T07:16:44.774
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 88a3e6261286db378fdffa1124cad11b3c05f5bb
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -230,12 -230,12 +230,12 @@@ F src/printf.c 8da9a2687a396daa19860f4d
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
  F src/resolve.c f4d79e31ffa5820c2e3d1740baa5e9b190425f2b
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
- F src/select.c 94e016b6733b1d39a2f4c8d431155b4c2897d907
- F src/shell.c d1ecce877f899abc97cabdf6a0b8323b8c5a0b69
- F src/sqlite.h.in 2d48e05677d0f9b06b7757662eef3cebea02d837
+ F src/select.c 72ffb62e2879956302140e9f6e6ae88aee36b0e5
+ F src/shell.c 9c1589c8271c04c02d23cdbc2c07bb40752fa9eb
+ F src/sqlite.h.in c7c9111477b76c82c46bf851b619df4dd35cc095
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
- F src/sqliteInt.h 07402857442948cc95c3a2f98a405cd9b118658b
 -F src/sqliteInt.h f2300529f3592323a98fd7acccec63d0e9082dc5
++F src/sqliteInt.h b536f3d79fd2ce71daac7fe618f8c919e705621a
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c 81712116e826b0089bb221b018929536b2b5406f
  F src/table.c e7a09215315a978057fb42c640f890160dbcc45e
@@@ -293,7 -293,7 +293,7 @@@ F src/update.c 250cefb96cfc7ca8f86f92ec
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
  F src/util.c 98a7627ca48ad3265b6940915a1d08355eb3fc7e
  F src/vacuum.c 9460b9de7b2d4e34b0d374894aa6c8a0632be8ec
- F src/vdbe.c f50f3663b8a88e39609b944776b811106f999a74
 -F src/vdbe.c 3d96875d883c2bf53a4806c9d4c5abff18511da4
++F src/vdbe.c 5d5bde8657b9089d142e0041619ed749955bde27
  F src/vdbe.h 6fc69d9c5e146302c56e163cb4b31d1ee64a18c3
  F src/vdbeInt.h bb56fd199d8af1a2c1b9639ee2f70724b4338e3a
  F src/vdbeapi.c 583d56b129dd27f12bed518270de9ebe521e6a75
@@@ -1247,7 -1246,7 +1247,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 0a7f2051b2cc9b4e060fd6081587502124e16c9e
- R 12c0ae072dce7a1a3217ff6d1ecb09c8
 -P d871a7921722bb0fef6d51e1110a9703ddff78c8
 -R abf39ccde1b147748baa7108926922a2
 -U drh
 -Z f5732dddfb21185ad5af5f2eb0f9450a
++P d42159429735c4a03f1d66887135487a9513ea29 b11d1793a06a44931edcbf12a615b49794d53a62
++R d229891901eb87b77ad2c3e9034c0c37
 +U dan
- Z 5e5cc540ee592a20a0076ae277f0733e
++Z 0bffe6be55c6357a0c14257a386bd69c
diff --cc manifest.uuid
index 8b14097370,3fc8b41ecb..3ccbe3a9fc
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- d42159429735c4a03f1d66887135487a9513ea29
 -b11d1793a06a44931edcbf12a615b49794d53a62
++35eef4ddd5010b869ed6daa5017caebc79d0b3fa