From: dan <dan@noemail.net>
Date: Wed, 7 Oct 2009 16:04:46 +0000 (+0000)
Subject: Add a missing OP_Close opcode to VDBE programs that check for FK constraint violations.
X-Git-Tag: fts3-refactor~123
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ed81bf60823a9275745d81d472e4a4fd12a3dd57;p=thirdparty%2Fsqlite.git

Add a missing OP_Close opcode to VDBE programs that check for FK constraint violations.

FossilOrigin-Name: 5caa4a2b050d5743b1407485cf419aa36cf16ac6
---

diff --git a/manifest b/manifest
index 25c89410d8..a20991102d 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Update\sthe\sheader\scomment\sfor\ssqlite3_blob_open\sto\snote\sthat\sit\sis\snot\spossible\sto\swrite\sto\sa\scolumn\sthat\sis\sindexed,\spart\sof\sa\sprimary\skey\sor,\sif\sforeign\skey\ssupport\sis\senabled,\spart\sof\sa\sforeign\skey.
-D 2009-10-07T11:29:40
+C Add\sa\smissing\sOP_Close\sopcode\sto\sVDBE\sprograms\sthat\scheck\sfor\sFK\sconstraint\sviolations.
+D 2009-10-07T16:04:47
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 4ca3f1dd6efa2075bcb27f4dc43eef749877740d
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -116,7 +116,7 @@ F src/date.c 657ff12ca0f1195b531561afacbb38b772d16638
 F src/delete.c 308e300d599d2d11b838687e2cf7309d42f29a1a
 F src/expr.c c7f3f718bd5c392344ec8694a41c1824f30cf375
 F src/fault.c dc88c821842157460750d2d61a8a8b4197d047ff
-F src/fkey.c 720f049dc4615a568b07cd7d65bbc499b8604f8a
+F src/fkey.c 6d27707f8163ea5325cb73be146a561b6d7b60cf
 F src/func.c e536218d193b8d326aab91120bc4c6f28aa2b606
 F src/global.c 271952d199a8cc59d4ce840b3bbbfd2f30c8ba32
 F src/hash.c ebcaa921ffd9d86f7ea5ae16a0a29d1c871130a7
@@ -755,7 +755,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 4c342c026a84f2608c2b331a1ac016117b80f108
-R 00933329f46af3182360d2ad1c009d61
+P 2fd487fdb669df89a8eb62cd0b7dc27ea1016edf
+R 9ddc4e2fa5a388e13b394f0c6d81b590
 U dan
-Z 3a796131fdffd0cdb05bbf577f31d08d
+Z 7ec5b231b6f1f0bf46023d4eea263057
diff --git a/manifest.uuid b/manifest.uuid
index 9bf93fab2c..e010ae6354 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2fd487fdb669df89a8eb62cd0b7dc27ea1016edf
\ No newline at end of file
+5caa4a2b050d5743b1407485cf419aa36cf16ac6
\ No newline at end of file
diff --git a/src/fkey.c b/src/fkey.c
index 45a00d2095..abe2f5cc1a 100644
--- a/src/fkey.c
+++ b/src/fkey.c
@@ -423,6 +423,7 @@ static void fkLookupParent(
   }
 
   sqlite3VdbeResolveLabel(v, iOk);
+  sqlite3VdbeAddOp1(v, OP_Close, iCur);
 }
 
 /*