Merge updates from trunk.

FossilOrigin-Name: 09cf240a7fb4022aeb1d7ae2a2455b5f97b53d68

diff --cc Makefile.in
Simple merge

diff --cc Makefile.msc
Simple merge

diff --cc main.mk
Simple merge

diff --cc manifest
index 7076746d4dd2abecc8a3019d3e2ef67a42818736,419633cc87033bed0ba03d191c4f5794ed571304..6afa83b6cf4a98f5c049a58127642ca548af5382
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,14 -1,14 +1,14 @@@
- C Fix\scomment.
- D 2013-11-26T01:13:18.839
 -C Fix\sthe\stext\sof\sa\scomment\sused\sto\sgenerate\sVDBE\sopcode\sdocumentation\sso\sthat\nit\somits\ssymbols\sthat\scan\sbe\smistaken\sfor\sa\shyperlink\sby\sthe\sparser.
 -D 2014-02-20T19:42:00.531
++C Merge\supdates\sfrom\strunk.
++D 2014-02-21T10:48:03.225
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 5d0d35aef4d0601493f9b26e2f859b3e471b63ed
 -F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
++F Makefile.in dd2b1aba364ff9b05de41086f74407f285c57670
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc d66f5d9f338735e07aa4f6e3c99491421cca24f5
 -F Makefile.msc 371a17ef9cd011b103cfa1964119a8528f5427c9
 -F Makefile.vxworks db21ed42a01d5740e656b16f92cb5d8d5e5dd315
 -F README.md 64f270c43c38c46de749e419c22f0ae2f4499fe8
++F Makefile.msc f8666729abb2f21e0fbecf1902281b161644fe96
 +F Makefile.vxworks 034289efa9d591b04b1a73598623119c306cbba0
- F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
- F VERSION 52f7e22bfcec71a462e34194b4ae1671380fde59
++F README.md 64f270c43c38c46de749e419c22f0ae2f4499fe8 w README
+ F VERSION 0dc30ad5cf90736d5fd9e540c9f05c542658abe7
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
- F addopcodes.awk 87ca612393d0f439550634bd2c156ea9ff6195ae
+ F addopcodes.awk 9eb448a552d5c0185cf62c463f9c173cedae3811
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
  F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
  F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2
@@@ -142,10 -142,7 +142,7 @@@ F ext/rtree/viewrtree.tcl eea6224b35535
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt f439556c5ce01ced70987e5ee86549a45165d9ff
- F main.mk 6e5cc23140ed3a85716c02376adc86aa11cfb673
- F mkdll.sh 7d09b23c05d56532e9d44a50868eb4b12ff4f74a
- F mkextu.sh 416f9b7089d80e5590a29692c9d9280a10dbad9f
- F mkextw.sh d2a981497b404d6498f5ff3e3b1f3816bdfcb338
 -F main.mk 3ae543fa446525c1dec55f58de67f41b78651812
++F main.mk 0dc14f8278caacce50844d83159a0e0e0f905424
  F mkopcodec.awk c2ff431854d702cdd2d779c9c0d1f58fa16fa4ea
  F mkopcodeh.awk c6b3fa301db6ef7ac916b14c60868aeaec1337b5
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
@@@ -200,38 -197,36 +197,38 @@@ F src/mutex.c d3b66a569368015e0fcb1ac15
  F src/mutex.h 5bc526e19dccc412b7ff04642f6fdad3fdfdabea
  F src/mutex_noop.c 7682796b7d8d39bf1c138248858efcd10c9e1553
  F src/mutex_unix.c c3a4e00f96ba068a8dbef34084465979aaf369cc
 -F src/mutex_w32.c 6108c88e1cb38d8fbb3534b170793815cbedbf97
 +F src/mutex_w32.c ab08c0fc54b71979370ca7c8f42fc64a9f211ebb
  F src/notify.c 976dd0f6171d4588e89e874fcc765e92914b6d30
- F src/os.c b4ad71336fd96f97776f75587cd9e8218288f5be
+ F src/os.c 1b147e4cf7cc39e618115c14a086aed44bc91ace
 -F src/os.h 4a46270a64e9193af4a0aaa3bc2c66dc07c29b3f
 +F src/os.h 60d419395e32a8029fa380a80a3da2e9030f635e
  F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
- F src/os_unix.c 143624d9eabb3b997c59cf594e0d06c56edd43e9
- F src/os_win.c 99a5668c207bee7fae238209a3043c03b6050056
 +F src/os_setup.h 3f9e87d981eef070c8a11e76b4704842a0e5870f
 -F src/os_win.c d4284f003445054a26689f1264b1b9bf7261bd1b
+ F src/os_unix.c 18f7f95dc6bcb9cf4d4a238d8e2de96611bc2ae5
- F src/pager.c 2aa4444ffe86e9282d03bc349a4a5e49bd77c0e8
- F src/pager.h f094af9f6ececfaa8a1e93876905a4f34233fb0c
- F src/parse.y acee1a9958539e21263362b194594c5255ad2fca
- F src/pcache.c f8043b433a57aba85384a531e3937a804432a346
++F src/os_win.c 8099d606b47e542f4d99f5893aa4c6704eb37197
 +F src/os_win.h ac253253d080dc3dd261efe5e98626c4b95e5a26
+ F src/pager.c 0ffa313a30ed6d061d9c6601b7b175cc50a1cab7
+ F src/pager.h ffd5607f7b3e4590b415b007a4382f693334d428
+ F src/parse.y 2613ca5d609c2f3d71dd297351f010bcec16e1e0
+ F src/pcache.c d8eafac28290d4bb80332005435db44991d07fc2
  F src/pcache.h a5e4f5d9f5d592051d91212c5949517971ae6222
- F src/pcache1.c a467393909a4ed7ca9de066d85ba5c5b04a5be63
- F src/pragma.c 5ab7279d132143feb77f773688a24ab05da75fd7
- F src/prepare.c 359d1a1e9c9bd4488e4dd3a1aaaf2d2ebb9bb768
- F src/printf.c da9119eb31a187a4b99f60aa4a225141c0ebb74b
- F src/random.c 0b2dbc37fdfbfa6bd455b091dfcef5bdb32dba68
- F src/resolve.c a70e32ae6ccb7b780f2b6d3e9e21837affc25ee5
+ F src/pcache1.c 102e6f5a2fbc646154463eb856d1fd716867b64c
+ F src/pragma.c a46ee83671f5c95f53d2ceeb5e1a818d7b1df99a
+ F src/prepare.c 677521ab7132615a8a26107a1d1c3132f44ae337
+ F src/printf.c 85d07756e45d7496d19439dcae3e6e9e0090f269
+ F src/random.c d10c1f85b6709ca97278428fd5db5bbb9c74eece
+ F src/resolve.c ca8b99d894164435f5c55cb304c1b8121705c51e
  F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
- F src/select.c d41381d80a22d3a83352aeca274cccf264ac277a
- F src/shell.c c4d06a9238a515ff4bc86b8626139633c09a00a2
- F src/sqlite.h.in a8328969be639b6cd8d9225ed2a51d9d624fff5f
+ F src/select.c 28bff39f9bc5ec618b0719fe3f7b4be9f88b6f02
+ F src/shell.c 3dd86bf73ccd079f0e32ef5069600586085e8239
+ F src/sqlite.h.in a2ef671f92747a5a1c8a47bad5c585a8dd9eca80
  F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
  F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
- F src/sqliteInt.h 9d586cb37572cd9e0a48242d449c6a69c2e74e72
+ F src/sqliteInt.h 616f8a225bfd6cf09f7f5906c7b91b29a3591b34
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
- F src/tclsqlite.c 3b5f3716e320480659239abe887164521c575d83
- F src/test1.c 8d96df19f045c629311751ed89c02c374d108e51
+ F src/tclsqlite.c e87c99e28a145943666b51b212dacae35fcea0bd
 -F src/test1.c 2401eee14a4309a7cfe2aeb2f30ad517a1d9c299
++F src/test1.c 899bddeb0c7fb2b8062de6f03af4a4e4f48f9df5
  F src/test2.c 7355101c085304b90024f2261e056cdff13c6c35
  F src/test3.c 1c0e5d6f080b8e33c1ce8b3078e7013fdbcd560c
  F src/test4.c 9b32d22f5f150abe23c1830e2057c4037c45b3df
@@@ -244,7 -239,7 +241,7 @@@ F src/test_async.c 21e11293a2f72080eda7
  F src/test_autoext.c dea8a01a7153b9adc97bd26161e4226329546e12
  F src/test_backup.c 3875e899222b651e18b662f86e0e50daa946344e
  F src/test_btree.c 5b89601dcb42a33ba8b820a6b763cc9cb48bac16
- F src/test_config.c 3186c5be34de7cd8c47487687e65ca2fb8bf6471
 -F src/test_config.c 0336e0bdbe541b4af89d7e3dd0656e8e6b51e585
++F src/test_config.c dabaa32868974e1ae39770cc17d7e066a9c38e6d
  F src/test_demovfs.c 69b2085076654ebc18014cbc6386f04409c959a9
  F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
  F src/test_fs.c ced436e3d4b8e4681328409b8081051ce614e28f
@@@ -1114,13 -1119,13 +1121,13 @@@ F tool/mkkeywordhash.c c9e05e4a7bcab8fa
  F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e
  F tool/mkpragmatab.tcl 78a77b2c554d534c6f2dc903130186ed15715460
  F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
 -F tool/mksqlite3c-noext.tcl 8bce31074e4cbe631bb7676526a048335f4c9f02
 -F tool/mksqlite3c.tcl e2ba20d3f690990079d17f3e5a7417dfb7ada543
 +F tool/mksqlite3c-noext.tcl 1712d3d71256ca1f297046619c89e77a4d7c8f6d
 +F tool/mksqlite3c.tcl db30eeba8bb34561985938438abca200689e8bc0
  F tool/mksqlite3h.tcl ba24038056f51fde07c0079c41885ab85e2cff12
 -F tool/mksqlite3internalh.tcl 3dca7bb5374cee003379b8cbac73714f610ef795
 +F tool/mksqlite3internalh.tcl b6514145a7d5321b47e64e19b8116cc44f973eb1
  F tool/mkvsix.tcl 6477fb9dab838b7eea1eed50658ff1cda04850b5
  F tool/offsets.c fe4262fdfa378e8f5499a42136d17bf3b98f6091
- F tool/omittest.tcl 4665982e95a6e5c1bd806cf7bc3dea95be422d77
+ F tool/omittest.tcl 34d7ac01fe4fd18e3637f64abe12c40eca0f6b97
  F tool/opcodeDoc.awk b3a2a3d5d3075b8bd90b7afe24283efdd586659c
  F tool/pagesig.c ff0ca355fd3c2398e933da5e22439bbff89b803b
  F tool/restore_jrnl.tcl 6957a34f8f1f0f8285e07536225ec3b292a9024a
@@@ -1145,7 -1151,7 +1153,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 540f5525160b516de282136ca77f909115a51630
- R 4b6ba147833b38d11479654f460b02e2
 -P 824029090d1c4c4c608f67dd197961eba29c039d
 -R 819e2e4df777a2f59b5f5445b2831eb5
 -U drh
 -Z c4d587ace814e560a6dc901fdec24d15
++P 8364af392da2946acd84633b45684e6fba5c39ed b46d4e8923e6e367412bba7aeac07039bbcbabd1
++R 1439033255b7868a0a47182ddcacb18d
 +U mistachkin
- Z d79a165fcb75b9e4bfcba919773d7cea
++Z e6967ecc5cd4d919e80c9df05bb76a17

diff --cc manifest.uuid
index aa49d278444589ffc425d96e97240215248d9743,32d13dfb30107b518570df759ceb4a89a566cb50..5a30d287481514a08c025aa7398a42480a3ec49b
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 8364af392da2946acd84633b45684e6fba5c39ed
 -b46d4e8923e6e367412bba7aeac07039bbcbabd1
++09cf240a7fb4022aeb1d7ae2a2455b5f97b53d68

diff --cc src/os_win.c
Simple merge

diff --cc src/test1.c
Simple merge

diff --cc src/test_config.c
Simple merge