From: drh <drh@noemail.net>
Date: Thu, 11 Jul 2013 15:31:57 +0000 (+0000)
Subject: Merge recent trunk changes (such as the query_only PRAGMA, the
X-Git-Tag: version-3.13.0~148^2~188
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6f855952d07e32967b84c790201da4b45d849722;p=thirdparty%2Fsqlite.git

Merge recent trunk changes (such as the query_only PRAGMA, the
defer_foreign_keys PRAGMA, and the SQLITE_DBSTATUS_DEFERRED_FKS parameter
to sqlite3_db_status()) into the sessions branch.

FossilOrigin-Name: 8dfc0b78c38e519b64a796243ff7c0aff688ff36
---

6f855952d07e32967b84c790201da4b45d849722
diff --cc manifest
index d549fe0174,a4304ca0f0..6a85c4db62
--- a/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Remove\sthe\sundocumented\ssqlite3_foreign_key_check()\sAPI\sand\sreplace\sit\swith\nsqlite3_db_status(db,\sSQLITE_DBSTATUS_DEFERRED_FKS,\s...).\s\sAdd\stest\scases\nfor\sthe\snew\sfunctionality.
- D 2013-07-11T13:49:59.348
 -C Add\sthe\sexperimental\s"query_only"\spragma.
 -D 2013-07-11T15:22:31.810
++C Merge\srecent\strunk\schanges\s(such\sas\sthe\squery_only\sPRAGMA,\sthe\ndefer_foreign_keys\sPRAGMA,\sand\sthe\sSQLITE_DBSTATUS_DEFERRED_FKS\sparameter\nto\ssqlite3_db_status())\sinto\sthe\ssessions\sbranch.
++D 2013-07-11T15:31:57.120
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
 +F Makefile.in aff38bc64c582dd147f18739532198372587b0f0
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc 7d226394826f060f232c0a02a468e8651819b7c2
 +F Makefile.msc ea294496193d9ed30137730b42ec2fc07ca5f544
  F Makefile.vxworks db21ed42a01d5740e656b16f92cb5d8d5e5dd315
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
  F VERSION f135b651727f978b7191bd6fa12c7fc1e13e13ac
@@@ -198,7 -185,7 +198,7 @@@ F src/journal.c b4124532212b6952f42eb2c
  F src/legacy.c 0df0b1550b9cc1f58229644735e317ac89131f12
  F src/lempar.c cdf0a000315332fc9b50b62f3b5e22e080a0952b
  F src/loadext.c c48f7f3f170e502fe0cc20748e03c6e0b5a016c2
- F src/main.c 93407bb51024f962ed9cf1c3e525e63484ebbdb9
 -F src/main.c e5810b2d7a0bd19f3d75ce60e3ed918cafc0a3f3
++F src/main.c e974ea9db6214a5f7cb4c1765b49d3aba1e3409f
  F src/malloc.c fe085aa851b666b7c375c1ff957643dc20a04bf6
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 437c7c4af964895d4650f29881df63535caaa1fa
@@@ -231,10 -218,10 +231,10 @@@ F src/resolve.c 89f9003e8316ee3a1727954
  F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
  F src/select.c 91b62654caf8dfe292fb8882715e575d34ad3874
  F src/shell.c c8cd06e6b66250a3ea0149c4edec30de14f57b6f
 -F src/sqlite.h.in 80d11140d401f366f7249f3c4fe031c49a5a06f8
 +F src/sqlite.h.in 17c84f6a2296a33a16141f4cff4b176278f3d1cc
  F src/sqlite3.rc fea433eb0a59f4c9393c8e6d76a6e2596b1fe0c0
  F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
- F src/sqliteInt.h 62b11aa829ab51446a52dfea93f14b8e1e5d5862
 -F src/sqliteInt.h 6d3115f774aa3e87737f9447c9c0cea992c5bdbf
++F src/sqliteInt.h b25c57bb70c098aa05548ecde1948f4106cba472
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -290,12 -277,12 +290,12 @@@ F src/update.c 19daebf6a0a67af5524913e9
  F src/utf.c 8d819e2e5104a430fc2005f018db14347c95a38f
  F src/util.c f566b5138099a2df8533b190d0dcc74b7dfbe0c9
  F src/vacuum.c d9c5759f4c5a438bb43c2086f72c5d2edabc36c8
- F src/vdbe.c 26f19a439806efdd9fb93b1874a4a7029a885142
 -F src/vdbe.c 420ebf1d551a76406cbbe0adc52d22d45aac039a
 -F src/vdbe.h b52887278cb173e66188da84dfab216bea61119d
 -F src/vdbeInt.h 5e666c971c555c7977714b0e34cb8d4b20282557
 -F src/vdbeapi.c c88222946d657984bdaf394604cb58ed1d641460
 -F src/vdbeaux.c 1633408f6dea06129441c5e2f22b2a5ce30fe97e
 -F src/vdbeblob.c 5dc79627775bd9a9b494dd956e26297946417d69
++F src/vdbe.c 4a9d00a91da42f6540203fc4e694235fd21347c9
 +F src/vdbe.h 1223e2548e0970cf96f573ff6b99f804a36ad683
 +F src/vdbeInt.h 11feb11eb49d8b312741011d30d91c9c50b59de0
 +F src/vdbeapi.c bca51b6ea254af3a1bbfd2a58522f6d6db214334
 +F src/vdbeaux.c 35846cedd64e90b83f498786775c69c2c6b6c8b1
 +F src/vdbeblob.c 1268e0bcb8e21fa32520b0fc376e1bcdfaa0c642
  F src/vdbemem.c 833005f1cbbf447289f1973dba2a0c2228c7b8ab
  F src/vdbesort.c 3937e06b2a0e354500e17dc206ef4c35770a5017
  F src/vdbetrace.c e7ec40e1999ff3c6414424365d5941178966dcbc
@@@ -1116,7 -1103,7 +1117,7 @@@ F tool/warnings-clang.sh f6aa929dc20ef1
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
  F tool/wherecosttest.c f407dc4c79786982a475261866a161cd007947ae
  F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
- P 3a2ab74c85a40e0e7ef2d6aef6ec23837cb788e6
- R 4b05e08ec28ee8fbe45f517a6910194e
 -P 527121ac3cdc96ac33ad975c227a6685a2f7e999 ece960c496717a3a6c25526ef77dd76b08d607bc
 -R 9c4545357c659a752e6cc07bddb23b90
++P d39e65fe702a2e11477f2d996f77404f45763368 6557c407983b067449deb76bc4c5248de64e07dc
++R a7fbb947af42ffbd616de92443f86cbe
  U drh
- Z 8f1a9fcd771ae153ffef09cc214c7392
 -Z 7d5f7fd6ecb9e38390dc44516a410268
++Z a9673e579f51d102bcb297135146bef6
diff --cc manifest.uuid
index 89b033640c,ac9eed930e..8073d518de
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- d39e65fe702a2e11477f2d996f77404f45763368
 -6557c407983b067449deb76bc4c5248de64e07dc
++8dfc0b78c38e519b64a796243ff7c0aff688ff36