Index: src/vdbeaux.c
==================================================================
--- src/vdbeaux.c
+++ src/vdbeaux.c
@@ -2894,11 +2894,11 @@
         }
       }
     }
 
     /* Check for immediate foreign key violations. */
-    if( p->rc==SQLITE_OK ){
+    if( p->rc==SQLITE_OK || (p->errorAction==OE_Fail && !isSpecialError) ){
       sqlite3VdbeCheckFk(p, 0);
     }
   
     /* If the auto-commit flag is set and this is the only active writer 
     ** VM, then we do either a commit or rollback of the current transaction. 

Index: test/fkey7.test
==================================================================
--- test/fkey7.test
+++ test/fkey7.test
@@ -80,6 +80,42 @@
     ANALYZE;
     INSERT INTO p4(id) VALUES(4);
   }
 }
 
+
+do_execsql_test 4.0 {
+  PRAGMA foreign_keys = true;
+  CREATE TABLE parent(
+    p PRIMARY KEY
+  );
+  CREATE TABLE child(
+    c UNIQUE REFERENCES parent(p)
+  );
+}
+
+do_catchsql_test 4.1 {
+  INSERT OR FAIL INTO child VALUES(123), (123);
+} {1 {FOREIGN KEY constraint failed}}
+
+do_execsql_test 4.2 {
+  SELECT * FROM child;
+} {}
+
+do_execsql_test 4.3 {
+  PRAGMA foreign_key_check;
+} {}
+
+do_catchsql_test 4.4 {
+  INSERT INTO parent VALUES(123);
+  INSERT OR FAIL INTO child VALUES(123), (123);
+} {1 {UNIQUE constraint failed: child.c}}
+
+do_execsql_test 4.5 {
+  SELECT * FROM child;
+} {123}
+
+do_execsql_test 4.6 {
+  PRAGMA foreign_key_check;
+} {}
+
 finish_test