From: mistachkin <mistachkin@noemail.net>
Date: Wed, 13 Mar 2013 20:52:11 +0000 (+0000)
Subject: Merge updates from trunk.
X-Git-Tag: version-3.8.1~11^2~18^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=46d269bc14accf2e2a3e59a1a6d2287345ba099b;p=thirdparty%2Fsqlite.git

Merge updates from trunk.

FossilOrigin-Name: d63fa039a01330f5300c3a936d2f9ffb018952b9
---

46d269bc14accf2e2a3e59a1a6d2287345ba099b
diff --cc manifest
index 088b73e209,42eb32ea0f..06ddd57ca4
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Rename\sthe\sexperimental\stodouble()\sfunction\sto\storeal(),\supdate\scomments.
- D 2013-03-13T06:48:05.170
 -C Enhance\stests\sfor\sticket\s[4dd95f6943].
 -D 2013-03-13T07:02:04.083
++C Merge\supdates\sfrom\strunk.
++D 2013-03-13T20:52:11.584
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 9a804abbd3cae82d196e4d33aba13239e32522a5
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -130,10 -130,10 +130,10 @@@ F src/complete.c dc1d136c0feee03c2f7550
  F src/ctime.c 72a70dcfda75d3a1f81041ce4573e7afddcd8e4e
  F src/date.c 067a81c9942c497aafd2c260e13add8a7d0c7dd4
  F src/delete.c aeabdabeeeaa0584127f291baa9617153d334778
- F src/expr.c a23b4aac2a455b2e76b55bef5dcfbe62b665375c
+ F src/expr.c d488bb60e54c9305d9fca1fa6fcc7bfbd23b13a2
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c e16942bd5c8a868ac53287886464a5ed0e72b179
 -F src/func.c 48987c025d69399f59a1c2a553cea5da41bf105d
 +F src/func.c d83c67a1d247389af7ad8a4c05b3665027658a17
  F src/global.c e59ecd2c553ad0d4bfbc84ca71231336f8993a7a
  F src/hash.c ac3470bbf1ca4ae4e306a8ecb0fdf1731810ffe4
  F src/hash.h 2894c932d84d9f892d4b4023a75e501f83050970
@@@ -176,10 -176,10 +176,10 @@@ F src/resolve.c 9079da7d59aed2bb14ec831
  F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
  F src/select.c e1c6f6abdf9f359f4e735cb8ae11d2f359bf52a9
  F src/shell.c 7c41bfcd9e5bf9d96b9215f79b03a5b2b44a3bca
- F src/sqlite.h.in 31045976254225e6bf046a96e87b40fa4c1d55e4
+ F src/sqlite.h.in f2fa32f440dda59ca47e22889966b2a6eb3b491c
  F src/sqlite3.rc fea433eb0a59f4c9393c8e6d76a6e2596b1fe0c0
  F src/sqlite3ext.h 7183ab832e23db0f934494f16928da127a571d75
- F src/sqliteInt.h 4d3c88acd03a6c480c52ad1324aecb8b4059a909
 -F src/sqliteInt.h 0f8f05ee4db4ba9120b38f7a3992b325698f6e8a
++F src/sqliteInt.h d86179b5d56992f1e9b51b602d586e84bc801a2b
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c bedc37ec1a6bb9399944024d63f4c769971955a9
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -1038,7 -1038,7 +1039,7 @@@ F tool/vdbe-compress.tcl f12c884766bd14
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
  F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
- P 05c4463ec5f36dde50f6eb116624dc40142f2c8c
- R 64196e5fa6ca1fac5ad547b6cea78dab
 -P 839aa91faf1db7025d90fa3c65e50efb829b053b
 -R ad71abb6cd4a6ebc6857153126653bad
 -U dan
 -Z 69b39b8becc09fc4758d1b797bf5f4f2
++P 12c318ef1b674d1ef347458ce149398885f5ba10 0b452734faa0839c817f040322e7733e423bfce2
++R 011bab8d3358f6e92d6e93fde439def7
 +U mistachkin
- Z b2ce5eefc524290638881e73eb677e9a
++Z c88ff015026f12ea9197209e8f5b599c
diff --cc manifest.uuid
index e5f1e9fbe5,3d8be2e93e..ab8ba3ce59
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 12c318ef1b674d1ef347458ce149398885f5ba10
 -0b452734faa0839c817f040322e7733e423bfce2
++d63fa039a01330f5300c3a936d2f9ffb018952b9