From: dan <dan@noemail.net>
Date: Thu, 27 Feb 2014 20:52:26 +0000 (+0000)
Subject: Merge in latest trunk changes.
X-Git-Tag: version-3.8.4~34^2~2^2~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a6efad8a97b14119face6d324f431e46d99a1d76;p=thirdparty%2Fsqlite.git

Merge in latest trunk changes.

FossilOrigin-Name: 8f30b09518d23c3f6cecd244a66ef918fdb55323
---

a6efad8a97b14119face6d324f431e46d99a1d76
diff --cc manifest
index e7df2f4996,6892cecea2..ab9697fb73
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Further\schanges\sto\ssqlite3VdbeRecordCompare().
- D 2014-02-27T20:44:18.479
 -C A\sbetter\sway\sof\shandling\sthe\sUSE_SYSTEM_SQLITE\s#define\sin\sshell.c.
 -D 2014-02-27T15:11:52.919
++C Merge\sin\slatest\strunk\schanges.
++D 2014-02-27T20:52:26.303
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -221,7 -221,7 +221,7 @@@ F src/shell.c bf75ce6bea4c8f56c1b46bee2
  F src/sqlite.h.in a2ef671f92747a5a1c8a47bad5c585a8dd9eca80
  F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
  F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
- F src/sqliteInt.h 7b42e02c1ca4599b5420d44cb549460b2348139a
 -F src/sqliteInt.h 46dfbe0b58282421188a6c25b6c0c0fae18e0134
++F src/sqliteInt.h 843e23d43ee2ab9369e68eb778815ba02835da59
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -1151,7 -1152,7 +1152,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
  F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
- P 85206e0bbac29adab52bef795f6d1479f2ae2c0e
- R eb22cd7a0c8c7d3bc8c75c472c26dd6a
 -P a6690400235705ecc0d1a60dacff6ad5fb1f944a
 -R d9e4cc8c2428822c2a58511d3bd2892d
 -U drh
 -Z 2ca6d024109a270000c3879d5e05ce0a
++P 570893740067a7caa952f259fa078cdf67017d71 51ce713c6ee91bdf0126155334dcc800b3daa509
++R f4fa5a4e2d9c34dae5f26cd35d7bbdb3
 +U dan
- Z 91158d7f280c804b2fe508b4511e22e9
++Z 489718005e4064c97910e87ca8ac5405
diff --cc manifest.uuid
index 927ab5603a,5a0d8578c1..ab94dbb62a
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 570893740067a7caa952f259fa078cdf67017d71
 -51ce713c6ee91bdf0126155334dcc800b3daa509
++8f30b09518d23c3f6cecd244a66ef918fdb55323