Version 3.7.12.1

FossilOrigin-Name: 972e75bb5d7349297b94cec2f19561ee105a22cf

diff --cc manifest
index 1d49107cd9a3b07d157a98cdb79f3d5c0d6d5a38,a2de57fcf1061691b52d1a645751bb16f6149834..33b5a9beeaf1553243dc8bd59a3bf1d6a89ac88a
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,7 -1,7 +1,7 @@@
- C Stylistic\sfixes:\slimit\ssource\scode\sline\slength\sto\s80\scharacters.\s\sC89-style\ncomments\sonly,\snot\sC++/C99\sstyle.
- D 2012-05-17T14:17:13.662
+ C Version\s3.7.12.1
 -D 2012-05-22T02:45:53.459
++D 2012-05-22T13:11:12.948
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 2f37e468503dbe79d35c9f6dffcf3fae1ae9ec20
 +F Makefile.in 957c9693400fca6cb8b533b589e69ddee7bcb27c
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
  F Makefile.msc 7849a871b6cdb20fd51baee6bbe5965a03326be4
  F Makefile.vxworks 3b7fe7a0571fdadc61363ebc1b23732d2d6363ca
@@@ -121,30 -118,30 +121,30 @@@ F src/auth.c 523da7fb4979469955d822ff92
  F src/backup.c 6be23a344d3301ae38e92fddb3a33b91c309fce4
  F src/bitvec.c af50f1c8c0ff54d6bdb7a80e2fceca5a93670bef
  F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
 -F src/btree.c df800f10896bc2ddaa1125c532d6e7a7b9efc532
 +F src/btree.c 207d4859d759074e6101bfed65cf87cdd3f794a8
  F src/btree.h 48a013f8964f12d944d90e4700df47b72dd6d923
  F src/btreeInt.h 38a639c0542c29fe8331a221c4aed0cb8686249e
- F src/build.c 987c6933ea170e443dc6a79d52f8d2506206b12b
+ F src/build.c 2bb2163bb1e69f59e9f36a9413079ead42fa1d2c
  F src/callback.c 0cb4228cdcd827dcc5def98fb099edcc9142dbcd
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
  F src/ctime.c a9c26822515f81ec21588cbb482ca6724be02e33
  F src/date.c 067a81c9942c497aafd2c260e13add8a7d0c7dd4
  F src/delete.c 4c20ea4f6213b3bc1c6a510586864b679946e05e
- F src/expr.c eefabaa4a3dc67309a754eb0eab1a163ff4c2bf3
+ F src/expr.c 06a7733d19dc725dc46ba51afd9feadb4b85d991
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c 657212460bf5cfd3ae607d12ea62092844c227b5
 -F src/func.c c6b3c94320253a35bda43fb69cc292618e3285d6
 +F src/func.c 067e50003af2b3c3b2f65575837ae8ef4be676f9
  F src/global.c 4cfdca5cb0edd33c4d021baec4ede958cb2c793b
  F src/hash.c 458488dcc159c301b8e7686280ab209f1fb915af
  F src/hash.h 2894c932d84d9f892d4b4023a75e501f83050970
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
  F src/insert.c 0bbffe75c254c62a5686ab5e7f88e29235e16174
  F src/journal.c 552839e54d1bf76fb8f7abe51868b66acacf6a0e
 -F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f
 +F src/legacy.c 015826a958f690302d27e096a68d50b3657e4201
  F src/lempar.c 0ee69fca0be54cd93939df98d2aca4ca46f44416
  F src/loadext.c f20382fbaeec832438a1ba7797bee3d3c8a6d51d
 -F src/main.c 91458c713e9b7f8dbc98d79e78f1150f0ca9c2a1
 +F src/main.c 9c3003dc0a5e2c7e1d79cf94a08229dd803fd8df
- F src/malloc.c 15afac5e59b6584efe072e9933aefb4230e74f97
+ F src/malloc.c fe085aa851b666b7c375c1ff957643dc20a04bf6
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c b3677415e69603d6a0e7c5410a1b3731d55beda1
  F src/mem2.c e307323e86b5da1853d7111b68fd6b84ad6f09cf
@@@ -170,18 -167,17 +170,18 @@@ F src/parse.y f29df90bd3adc64b33114ab1d
  F src/pcache.c f8043b433a57aba85384a531e3937a804432a346
  F src/pcache.h 1b5dcc3dc8103d03e625b177023ee67764fa6b7c
  F src/pcache1.c b30b1c35908346ecc43d8d9d17f2ddf6817f8f60
 -F src/pragma.c e708b3bb5704605816f617e0b1d63a5488060715
 -F src/prepare.c 9a00a9612ebf80203fbb41f8a29ab8cb27a05f40
 +F src/pragma.c 29db41fc84bd7853d6c7ef85f9f8bd56a8be4320
- F src/prepare.c 4450a714a7ebb4b0ce4159087338e1159d083885
++F src/prepare.c 2e49f73ffb38d7ef3302931f17412adab61e46a1
  F src/printf.c 7ffb4ebb8b341f67e049695ba031da717b3d2699
  F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
- F src/resolve.c 748e75299faff345f34f0e5bd02a2bac8aa69fcd
+ F src/resolve.c b3c70ab28cac60de33684c9aa9e5138dcf71d6dd
  F src/rowset.c f6a49f3e9579428024662f6e2931832511f831a1
- F src/select.c cf2f8f771bab6417e51a0f17b086a87bb74d624c
- F src/shell.c 04399b2f9942bd02ed5ffee3b84bcdb39c52a1e6
 -F src/select.c f6c4833c4d8e94714761d99013d74f381e084f1d
++F src/select.c 7bc4a2e66ae0fc40bb46038441e3e7bf138d7079
+ F src/shell.c c16f72e34f611f060546709564c121a67cb2b31b
 -F src/sqlite.h.in 4f4d4792f6fb00387c877af013cb09d955643f12
 +F src/sqlite.h.in 192eb22f3f217c00ff48a8da356a8a020f6b4a8e
 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1
  F src/sqlite3ext.h 6904f4aadf976f95241311fbffb00823075d9477
- F src/sqliteInt.h ec90f0d797bbc93dd849629f18513b57bfd9a787
 -F src/sqliteInt.h 97ccae71ae0a4e924dcb9fab14eb4fc4839790da
++F src/sqliteInt.h e68fc7ec857b71836aa73c40b39fb2f0afa6a54a
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 35939e7e03abf1b7577ce311f48f682c40de3208
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -217,9 -213,9 +217,9 @@@ F src/test_mutex.c a6bd7b9cf6e19d989e31
  F src/test_onefile.c 0396f220561f3b4eedc450cef26d40c593c69a25
  F src/test_osinst.c 90a845c8183013d80eccb1f29e8805608516edba
  F src/test_pcache.c a5cd24730cb43c5b18629043314548c9169abb00
- F src/test_quota.c 9d6be9cd3bb132df2b964193b6a4ec850f50a210
+ F src/test_quota.c 47cb7b606160ce8f603a7d47143dd1f74de09058
  F src/test_quota.h ee5da2ae7f84d1c8e0e0e2ab33f01d69f10259b5
 -F src/test_rtree.c aba603c949766c4193f1068b91c787f57274e0d9
 +F src/test_rtree.c a1bbfc30f14d2bad2f93dbea7dcc697c97a40c66
  F src/test_schema.c 8c06ef9ddb240c7a0fcd31bc221a6a2aade58bf0
  F src/test_server.c 2f99eb2837dfa06a4aacf24af24c6affdf66a84f
  F src/test_spellfix.c 495535f3eb57acdc384572da570e869bb1834bf4
@@@ -246,13 -242,13 +246,13 @@@ F src/vdbeaux.c 88b9df24bcab179fbe7a39d
  F src/vdbeblob.c 32f2a4899d67f69634ea4dd93e3f651936d732cb
  F src/vdbemem.c cb55e84b8e2c15704968ee05f0fae25883299b74
  F src/vdbesort.c b25814d385895544ebc8118245c8311ded7f81c9
- F src/vdbetrace.c 2405f68d14c49d2e0a798d71e35d62b8569bfb65
 -F src/vdbetrace.c 79059ebd17b3c8545fab2a24253713e77e4ab392
++F src/vdbetrace.c 6700008a6a05e6e39531ed252c32557ceb962b91
  F src/vtab.c ae657b1c22cff43863458e768a44f915c07bc0e4
 -F src/wal.c 7bb3ad807afc7973406c805d5157ec7a2f65e146
 -F src/wal.h 29c197540b19044e6cd73487017e5e47a1d3dac6
 +F src/wal.c 1ff2ebb47ba29610abd768bf74cecd9c33049ebf
 +F src/wal.h ce626f1f9000caf09a99a6634a8d794686f92e1b
  F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f
  F src/where.c 24c7494d8875ead994b4dfe5461340c27fd424ca
 -F test/8_3_names.test 631ea964a3edb091cf73c3b540f6bcfdb36ce823
 +F test/8_3_names.test 0ed0f6711fefac33829ef9f1d6ca3c56c48ef1c7
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
  F test/alias.test 4529fbc152f190268a15f9384a5651bbbabc9d87
  F test/all.test 52fc8dee494092031a556911d404ca30a749a30b
@@@ -715,9 -711,9 +716,9 @@@ F test/speed4.test abc0ad3399dcf9703abe
  F test/speed4p.explain 6b5f104ebeb34a038b2f714150f51d01143e59aa
  F test/speed4p.test 0e51908951677de5a969b723e03a27a1c45db38b
  F test/sqllimits1.test b1aae27cc98eceb845e7f7adf918561256e31298
 -F test/stat.test 08e8185b3fd5b010c90d7ad82b9dd4ea1cbf14b0
 -F test/stmt.test 25d64e3dbf9a3ce89558667d7f39d966fe2a71b9
 +F test/stat.test 4ce96d67f6a0bc9647a042c7140cf1c56e049a69
 +F test/stmt.test 78a6764439cfa5abdcbf98d4d084739e81eeec4f
- F test/subquery.test c5e0d183f1ae6251453338a465b32ae11326e0fa
+ F test/subquery.test d4aea23ac267463d4aa604bf937c3992347b20f7
  F test/subquery2.test edcad5c118f0531c2e21bf16a09bbb105252d4cd
  F test/subselect.test d24fd8757daf97dafd2e889c73ea4c4272dcf4e4
  F test/substr.test 18f57c4ca8a598805c4d64e304c418734d843c1a
@@@ -1002,7 -998,10 +1003,7 @@@ F tool/tostr.awk e75472c2f98dd76e06b8c9
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings-clang.sh a8a0a3babda96dfb1ff51adda3cbbf3dfb7266c2
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
- P 92e7bb907802c905f99ed4c47669f97723f63ed3
- R f3f2773d6a682ce0fd18d2ccb31ff7ae
 -P 5519cc5ef471e32a59995a34be811b46478dca1e
 -R f9f0e59804fa7e60869ace7ace22bd3d
 -T +bgcolor * #d0c0ff
 -T +sym-release *
 -T +sym-version-3.7.12.1 *
++P 4068abe05c3a94c9ac7cff72b77fb8e47a2b1a5d 6d326d44fd1d626aae0e8456e5fa2049f1ce0789
++R c922f8f99b5b09d1465707239bb63cb8
  U drh
- Z 709f855ac1ee73fe28f0a0a5f9d3ed60
 -Z a30e57621f706278c1c64a3624297cbb
++Z 7d8c65e663650788e8582bc64982bc90

diff --cc manifest.uuid
index 3fcf005ad63de19cca042652ada2fe5cd9753754,ff54f427e8169ef31c437d977bcca43affc846d1..72b478a252a46060f10615ff880b0fc08c00b53e
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 4068abe05c3a94c9ac7cff72b77fb8e47a2b1a5d
 -6d326d44fd1d626aae0e8456e5fa2049f1ce0789
++972e75bb5d7349297b94cec2f19561ee105a22cf

diff --cc src/prepare.c
Simple merge

diff --cc src/select.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/vdbetrace.c
Simple merge