Index: src/build.c
==================================================================
--- src/build.c
+++ src/build.c
@@ -1772,11 +1772,11 @@
 
   /* Make sure every column of the PRIMARY KEY is NOT NULL.  (Except,
   ** do not enforce this for imposter tables.) */
   if( !db->init.imposterTable ){
     for(i=0; i<nPk; i++){
-      pTab->aCol[pPk->aiColumn[i]].notNull = 1;
+      pTab->aCol[pPk->aiColumn[i]].notNull = OE_Abort;
     }
     pPk->uniqNotNull = 1;
   }
 
   /* The root page of the PRIMARY KEY is the table root page */

Index: test/conflict2.test
==================================================================
--- test/conflict2.test
+++ test/conflict2.test
@@ -287,15 +287,15 @@
 # Update: Since temporary table files are now opened lazily, and none
 # of the following tests use large quantities of data, t3 is always 0.
 #
 foreach {i conf1 cmd t0 t1 t2 t3 t4} {
   1 {}       UPDATE                  1 {6 7 8 9}  1 0 1
-  2 REPLACE  UPDATE                  0 {7 6 9}    1 0 0
-  3 IGNORE   UPDATE                  0 {6 7 3 9}  1 0 0
-  4 FAIL     UPDATE                  1 {6 7 3 4}  1 0 0
+  2 REPLACE  UPDATE                  0 {7 6 9}    1 1 0
+  3 IGNORE   UPDATE                  0 {6 7 3 9}  1 1 0
+  4 FAIL     UPDATE                  1 {6 7 3 4}  1 1 0
   5 ABORT    UPDATE                  1 {1 2 3 4}  1 0 1
-  6 ROLLBACK UPDATE                  1 {1 2 3 4}  0 0 0
+  6 ROLLBACK UPDATE                  1 {1 2 3 4}  0 1 0
   7 REPLACE  {UPDATE OR IGNORE}      0 {6 7 3 9}  1 0 0
   8 IGNORE   {UPDATE OR REPLACE}     0 {7 6 9}    1 0 1
   9 FAIL     {UPDATE OR IGNORE}      0 {6 7 3 9}  1 0 0
  10 ABORT    {UPDATE OR REPLACE}     0 {7 6 9}    1 0 1
  11 ROLLBACK {UPDATE OR IGNORE}      0 {6 7 3 9}  1 0 0

Index: test/without_rowid5.test
==================================================================
--- test/without_rowid5.test
+++ test/without_rowid5.test
@@ -130,13 +130,17 @@
 do_execsql_test without_rowid5-5.1 {
   CREATE TABLE ipk(key INTEGER PRIMARY KEY, val TEXT) WITHOUT ROWID;
   INSERT INTO ipk VALUES('rival','bonus'); -- ok to insert non-integer key
   SELECT * FROM ipk;
 } {rival bonus}
-do_catchsql_test without_rowid5-5.2 {
+do_catchsql_test without_rowid5-5.2a {
+  BEGIN;
   INSERT INTO ipk VALUES(NULL,'sample'); -- no automatic generation of keys
 } {1 {NOT NULL constraint failed: ipk.key}}
+do_execsql_test without_rowid5-5.2b {
+  ROLLBACK;
+} {}
 
 # EVIDENCE-OF: R-33142-02092 AUTOINCREMENT does not work on WITHOUT
 # ROWID tables.
 #
 # EVIDENCE-OF: R-53084-07740 An error is raised if the "AUTOINCREMENT"