Merge updates from trunk.

FossilOrigin-Name: bf90f1fbf84a288e787a563a3952d30622b26ef9

diff --cc manifest
index 9fbe50fb3b9df829ff00a7bc51f9b57d0c6e551b,c499b1397e4cd2249ce6c836453b4407fdd9351b..bf9bbccd0835d660267ccc771f400d8986c52d15
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,12 -1,12 +1,12 @@@
 -C Do\snot\sraise\san\serror\sif\san\sunknown\sSQL\sfunction\sis\sfound\sin\sa\sCHECK\sconstraint\swhile\sparsing\sthe\sschema\sof\san\sexisting\sdatabase.
 -D 2013-01-07T13:26:23.647
 +C Merge\supdates\sfrom\strunk.
- D 2012-12-08T06:46:05.624
++D 2013-01-07T17:31:34.512
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 690d441a758cbffd13e814dc2724a721a6ebd400
+ F Makefile.in a48faa9e7dd7d556d84f5456eabe5825dd8a6282
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc 5a3b6f34d263b01f8b798c291fac1529fd650308
+ F Makefile.msc 2b8371775ea8df029d1acf0c3d4c3782d3bd5711
  F Makefile.vxworks b18ad88e9a8c6a001f5cf4a389116a4f1a7ab45f
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
- F VERSION edab4af5a4623f8198833ea481ce98ab53750a8d
+ F VERSION 6d4f66eaebabc42ef8c2a4d2d0caf4ce7ee81137
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F addopcodes.awk 17dc593f791f874d2c23a0f9360850ded0286531
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
@@@ -130,11 -130,11 +130,11 @@@ F src/complete.c dc1d136c0feee03c2f7550
  F src/ctime.c 72a70dcfda75d3a1f81041ce4573e7afddcd8e4e
  F src/date.c 067a81c9942c497aafd2c260e13add8a7d0c7dd4
  F src/delete.c 9b8d308979114991e5dc7cee958316e07186941d
- F src/expr.c 3b25a95f3d309403940ba4a3212f197b8b6251d5
+ F src/expr.c 4dff0b04eaaf133789279c6b8cd69175dfbb1691
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
- F src/fkey.c c82a04e7a92bb728f9ab972b76590403283be2af
+ F src/fkey.c 5b7a12e2f8620e855b0478a9a6798df9967bb277
  F src/func.c 8147799b048065a1590805be464d05b4913e652c
 -F src/global.c e59ecd2c553ad0d4bfbc84ca71231336f8993a7a
 +F src/global.c 36c6d6600b53d0ae68189d6b5fdc04b7bf90f190
  F src/hash.c ac3470bbf1ca4ae4e306a8ecb0fdf1731810ffe4
  F src/hash.h 2894c932d84d9f892d4b4023a75e501f83050970
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
@@@ -172,14 -172,14 +172,14 @@@ F src/pragma.c 8907c559d3127729d3bcedb1
  F src/prepare.c 931ad0d852a0df48f79adcba6ce79ca5f475625c
  F src/printf.c 4a9f882f1c1787a8b494a2987765acf9d97ac21f
  F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
- F src/resolve.c 7b986a715ac281643309c29257bb58cfae7aa810
+ F src/resolve.c e41ccbe4e01b1dc22479317a8e0184dff206c61c
  F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
- F src/select.c 1462a391952c7659168460fe2d7eed7d41529be1
- F src/shell.c e392dd1ccbb77cc1d75a8367a89b473c24bea019
- F src/sqlite.h.in 7d2e9e4d3be5950d0a87029dbae054d0df36f9c8
+ F src/select.c 395e458a6dc611cbe1179f424753f0c344957607
+ F src/shell.c 11c9611580bb2ffce3a232f31f7f8cc310df0843
 -F src/sqlite.h.in 39cc33bb08897c748fe3383c29ccf56585704177
++F src/sqlite.h.in cd8236d4ebd64e1694f221a7f3ad4e5ccc96b413
  F src/sqlite3.rc fea433eb0a59f4c9393c8e6d76a6e2596b1fe0c0
  F src/sqlite3ext.h 6904f4aadf976f95241311fbffb00823075d9477
- F src/sqliteInt.h b9d79d391e3ebff3fbe899bed330b1223958b5d8
 -F src/sqliteInt.h e998703742455b2241731424c6ec142fd8d0258f
++F src/sqliteInt.h 8829b00e8d5898a47423f01b4e55a22ff2c25925
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c bedc37ec1a6bb9399944024d63f4c769971955a9
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -1025,7 -1031,7 +1031,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 f021559d8a23934e3bdccad5b55fc7a91d185f53 2d5f37c99a9e5377409697f5392a1ca55970964e
- R fefd32a0ceb384fa3fe738352308f54d
 -P 7695b88fe0d73fd0a36fb7d8f95350b80615a89e
 -R 9a3bff9cb6013200a01cbc0ed4f44558
 -U dan
 -Z 791019463b5aabd6eb50149b1f94afdd
++P e65db42c9fdc1d6f257c8db54a46ee4fc0d7aaf0 0a1207c895d9f77586a3a2a4965175909be90503
++R c592e8281674aabcb292e26e43bc11c5
 +U mistachkin
- Z 2163da0146cd8798981d552092368646
++Z dea10d8d285ccfffa210d46cd087e767

diff --cc manifest.uuid
index 476eaea8de1c008e4073afc67a36e67d6e56cc4e,2c548d9fc36065f2a0979c9ce0090c20484f1aac..72c193b730f6b7c8b863f13b498cf52065003bff
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- e65db42c9fdc1d6f257c8db54a46ee4fc0d7aaf0
 -0a1207c895d9f77586a3a2a4965175909be90503
++bf90f1fbf84a288e787a563a3952d30622b26ef9

diff --cc src/sqlite.h.in
Simple merge

diff --cc src/sqliteInt.h
Simple merge