From: drh <drh@noemail.net>
Date: Thu, 9 Dec 2010 19:15:17 +0000 (+0000)
Subject: Add support for the SQLITE_DEFAULT_FOREIGN_KEYS compile-time option.
X-Git-Tag: version-3.7.5~74
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a4bfd7fde821eca44a6a217a9bc82700084586ec;p=thirdparty%2Fsqlite.git

Add support for the SQLITE_DEFAULT_FOREIGN_KEYS compile-time option.

FossilOrigin-Name: c959945ab7129b67eb2364befb9bf5cc88a8b0bf
---

diff --git a/manifest b/manifest
index 2bfa063aad..e8e5f88473 100644
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-C Mention\sthe\sSQLITE_DEFAULT_WAL_AUTOCHECKPOINT\scompile-time\soption\sin\sthe\ndocumentation\sfor\sthe\ssqlite3_wal_autocheckpoint()\sinterface.
-D 2010-12-09T18:55:10
+C Add\ssupport\sfor\sthe\sSQLITE_DEFAULT_FOREIGN_KEYS\scompile-time\soption.
+D 2010-12-09T19:15:17
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 4547616ad2286053af6ccccefa242dc925e49bf0
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -144,7 +144,7 @@ F src/journal.c 552839e54d1bf76fb8f7abe51868b66acacf6a0e
 F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f
 F src/lempar.c 7f026423f4d71d989e719a743f98a1cbd4e6d99e
 F src/loadext.c 8af9fcc75708d60b88636ccba38b4a7b3c155c3e
-F src/main.c 721e5530b14b91a1fb6aead279af8b8729fa9a20
+F src/main.c b82ea116fc9e2e059e77b9a1aba76267681f7149
 F src/malloc.c 3d7284cd9346ab6e3945535761e68c23c6cf40ef
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 F src/mem1.c 00bd8265c81abb665c48fea1e0c234eb3b922206
@@ -897,14 +897,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 9c19b7ae3542fd1fac692b4471f1839b22685c76
-R 9fc220aeb3ca470dbed46dad4b9aed8d
+P 5a52dd59ff577b071b4ed9316dc3bc753a18c8da
+R f77079846f4aaed873cf9f6ceda77529
 U drh
-Z 1132cb60f4e8c33d250be651797c62dc
+Z 52a27da9ef768b0e16942ded7463031d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFNASYRoxKgR168RlERAkTOAJ43Vd+nEvp2oWH+XAz9YxMSE5KCZwCfZw+1
-GacVWoNSt5pj2hAFO+nz9+A=
-=Kbdc
+iD8DBQFNASrIoxKgR168RlERAqlaAJ9aEPuysxoQS1x9hi1oYTyTN055FACfbx1X
+aPAgBUJmi1Z0CWWDapob82w=
+=QBYv
 -----END PGP SIGNATURE-----
diff --git a/manifest.uuid b/manifest.uuid
index 8401774de4..727165bc7a 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5a52dd59ff577b071b4ed9316dc3bc753a18c8da
\ No newline at end of file
+c959945ab7129b67eb2364befb9bf5cc88a8b0bf
\ No newline at end of file
diff --git a/src/main.c b/src/main.c
index f9e1a1c138..4b93a2ba54 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1821,6 +1821,9 @@ static int openDatabase(
 #endif
 #if SQLITE_DEFAULT_RECURSIVE_TRIGGERS
                  | SQLITE_RecTriggers
+#endif
+#if defined(SQLITE_DEFAULT_FOREIGN_KEYS) && SQLITE_DEFAULT_FOREIGN_KEYS
+                 | SQLITE_ForeignKeys
 #endif
       ;
   sqlite3HashInit(&db->aCollSeq);