Index: src/btree.c
==================================================================
--- src/btree.c
+++ src/btree.c
@@ -8188,10 +8188,11 @@
     dropCell(pPage, idx, info.nSize, &rc);
     if( rc ) goto end_insert;
   }else if( loc<0 && pPage->nCell>0 ){
     assert( pPage->leaf );
     idx = ++pCur->ix;
+    pCur->curFlags &= ~BTCF_ValidNKey;
   }else{
     assert( pPage->leaf );
   }
   insertCell(pPage, idx, newCell, szNew, 0, 0, &rc);
   assert( pPage->nOverflow==0 || rc==SQLITE_OK );

Index: test/conflict3.test
==================================================================
--- test/conflict3.test
+++ test/conflict3.test
@@ -17,17 +17,18 @@
 # IGNORE, and FAIL conflict resolution play well together.
 #
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
+set testprefix conflict3
 
 ifcapable !conflict {
   finish_test
   return
 }
 
-do_execsql_test conflict-1.1 {
+do_execsql_test 1.1 {
   CREATE TABLE t1(
     a INTEGER PRIMARY KEY ON CONFLICT REPLACE, 
     b UNIQUE ON CONFLICT IGNORE,
     c UNIQUE ON CONFLICT FAIL
   );
@@ -35,28 +36,28 @@
   SELECT a,b,c FROM t1 ORDER BY a;
 } {1 2 3 2 3 4}
 
 # Insert a row that conflicts on column B.  The insert should be ignored.
 #
-do_execsql_test conflict-1.2 {
+do_execsql_test 1.2 {
   INSERT INTO t1(a,b,c) VALUES(3,2,5);
   SELECT a,b,c FROM t1 ORDER BY a;
 } {1 2 3 2 3 4}
 
 # Insert two rows where the second conflicts on C.  The first row show go
 # and and then there should be a constraint error.
 #
-do_test conflict-1.3 {
+do_test 1.3 {
   catchsql {INSERT INTO t1(a,b,c) VALUES(4,5,6), (5,6,4);}
 } {1 {UNIQUE constraint failed: t1.c}}
-do_execsql_test conflict-1.4 {
+do_execsql_test 1.4 {
   SELECT a,b,c FROM t1 ORDER BY a;
 } {1 2 3 2 3 4 4 5 6}
 
 # Replete the tests above, but this time on a table non-INTEGER primary key.
 #
-do_execsql_test conflict-2.1 {
+do_execsql_test 2.1 {
   DROP TABLE t1;
   CREATE TABLE t1(
     a INT PRIMARY KEY ON CONFLICT REPLACE, 
     b UNIQUE ON CONFLICT IGNORE,
     c UNIQUE ON CONFLICT FAIL
@@ -65,28 +66,28 @@
   SELECT a,b,c FROM t1 ORDER BY a;
 } {1 2 3 2 3 4}
 
 # Insert a row that conflicts on column B.  The insert should be ignored.
 #
-do_execsql_test conflict-2.2 {
+do_execsql_test 2.2 {
   INSERT INTO t1(a,b,c) VALUES(3,2,5);
   SELECT a,b,c FROM t1 ORDER BY a;
 } {1 2 3 2 3 4}
 
 # Insert two rows where the second conflicts on C.  The first row show go
 # and and then there should be a constraint error.
 #
-do_test conflict-2.3 {
+do_test 2.3 {
   catchsql {INSERT INTO t1(a,b,c) VALUES(4,5,6), (5,6,4);}
 } {1 {UNIQUE constraint failed: t1.c}}
-do_execsql_test conflict-2.4 {
+do_execsql_test 2.4 {
   SELECT a,b,c FROM t1 ORDER BY a;
 } {1 2 3 2 3 4 4 5 6}
 
 # Replete again on a WITHOUT ROWID table.
 #
-do_execsql_test conflict-3.1 {
+do_execsql_test 3.1 {
   DROP TABLE t1;
   CREATE TABLE t1(
     a INT PRIMARY KEY ON CONFLICT REPLACE, 
     b UNIQUE ON CONFLICT IGNORE,
     c UNIQUE ON CONFLICT FAIL
@@ -95,28 +96,28 @@
   SELECT a,b,c FROM t1 ORDER BY a;
 } {1 2 3 2 3 4}
 
 # Insert a row that conflicts on column B.  The insert should be ignored.
 #
-do_execsql_test conflict-3.2 {
+do_execsql_test 3.2 {
   INSERT INTO t1(a,b,c) VALUES(3,2,5);
   SELECT a,b,c FROM t1 ORDER BY a;
 } {1 2 3 2 3 4}
 
 # Insert two rows where the second conflicts on C.  The first row show go
 # and and then there should be a constraint error.
 #
-do_test conflict-3.3 {
+do_test 3.3 {
   catchsql {INSERT INTO t1(a,b,c) VALUES(4,5,6), (5,6,4);}
 } {1 {UNIQUE constraint failed: t1.c}}
-do_execsql_test conflict-3.4 {
+do_execsql_test 3.4 {
   SELECT a,b,c FROM t1 ORDER BY a;
 } {1 2 3 2 3 4 4 5 6}
 
 # Arrange the table rows in a different order and repeat.
 #
-do_execsql_test conflict-4.1 {
+do_execsql_test 4.1 {
   DROP TABLE t1;
   CREATE TABLE t1(
     b UNIQUE ON CONFLICT IGNORE,
     c UNIQUE ON CONFLICT FAIL,
     a INT PRIMARY KEY ON CONFLICT REPLACE
@@ -125,28 +126,28 @@
   SELECT a,b,c FROM t1 ORDER BY a;
 } {1 2 3 2 3 4}
 
 # Insert a row that conflicts on column B.  The insert should be ignored.
 #
-do_execsql_test conflict-4.2 {
+do_execsql_test 4.2 {
   INSERT INTO t1(a,b,c) VALUES(3,2,5);
   SELECT a,b,c FROM t1 ORDER BY a;
 } {1 2 3 2 3 4}
 
 # Insert two rows where the second conflicts on C.  The first row show go
 # and and then there should be a constraint error.
 #
-do_test conflict-4.3 {
+do_test 4.3 {
   catchsql {INSERT INTO t1(a,b,c) VALUES(4,5,6), (5,6,4);}
 } {1 {UNIQUE constraint failed: t1.c}}
-do_execsql_test conflict-4.4 {
+do_execsql_test 4.4 {
   SELECT a,b,c FROM t1 ORDER BY a;
 } {1 2 3 2 3 4 4 5 6}
 
 # Arrange the table rows in a different order and repeat.
 #
-do_execsql_test conflict-5.1 {
+do_execsql_test 5.1 {
   DROP TABLE t1;
   CREATE TABLE t1(
     b UNIQUE ON CONFLICT IGNORE,
     a INT PRIMARY KEY ON CONFLICT REPLACE,
     c UNIQUE ON CONFLICT FAIL
@@ -155,28 +156,28 @@
   SELECT a,b,c FROM t1 ORDER BY a;
 } {1 2 3 2 3 4}
 
 # Insert a row that conflicts on column B.  The insert should be ignored.
 #
-do_execsql_test conflict-5.2 {
+do_execsql_test 5.2 {
   INSERT INTO t1(a,b,c) VALUES(3,2,5);
   SELECT a,b,c FROM t1 ORDER BY a;
 } {1 2 3 2 3 4}
 
 # Insert two rows where the second conflicts on C.  The first row show go
 # and and then there should be a constraint error.
 #
-do_test conflict-5.3 {
+do_test 5.3 {
   catchsql {INSERT INTO t1(a,b,c) VALUES(4,5,6), (5,6,4);}
 } {1 {UNIQUE constraint failed: t1.c}}
-do_execsql_test conflict-5.4 {
+do_execsql_test 5.4 {
   SELECT a,b,c FROM t1 ORDER BY a;
 } {1 2 3 2 3 4 4 5 6}
 
 # Arrange the table rows in a different order and repeat.
 #
-do_execsql_test conflict-6.1 {
+do_execsql_test 6.1 {
   DROP TABLE t1;
   CREATE TABLE t1(
     c UNIQUE ON CONFLICT FAIL,
     a INT PRIMARY KEY ON CONFLICT REPLACE,
     b UNIQUE ON CONFLICT IGNORE
@@ -185,28 +186,28 @@
   SELECT a,b,c FROM t1 ORDER BY a;
 } {1 2 3 2 3 4}
 
 # Insert a row that conflicts on column B.  The insert should be ignored.
 #
-do_execsql_test conflict-6.2 {
+do_execsql_test 6.2 {
   INSERT INTO t1(a,b,c) VALUES(3,2,5);
   SELECT a,b,c FROM t1 ORDER BY a;
 } {1 2 3 2 3 4}
 
 # Insert two rows where the second conflicts on C.  The first row show go
 # and and then there should be a constraint error.
 #
-do_test conflict-6.3 {
+do_test 6.3 {
   catchsql {INSERT INTO t1(a,b,c) VALUES(4,5,6), (5,6,4);}
 } {1 {UNIQUE constraint failed: t1.c}}
-do_execsql_test conflict-6.4 {
+do_execsql_test 6.4 {
   SELECT a,b,c FROM t1 ORDER BY a;
 } {1 2 3 2 3 4 4 5 6}
 
 # Change which column is the PRIMARY KEY
 #
-do_execsql_test conflict-7.1 {
+do_execsql_test 7.1 {
   DROP TABLE t1;
   CREATE TABLE t1(
     a UNIQUE ON CONFLICT REPLACE, 
     b INTEGER PRIMARY KEY ON CONFLICT IGNORE,
     c UNIQUE ON CONFLICT FAIL
@@ -215,28 +216,28 @@
   SELECT a,b,c FROM t1 ORDER BY a;
 } {1 2 3 2 3 4}
 
 # Insert a row that conflicts on column B.  The insert should be ignored.
 #
-do_execsql_test conflict-7.2 {
+do_execsql_test 7.2 {
   INSERT INTO t1(a,b,c) VALUES(3,2,5);
   SELECT a,b,c FROM t1 ORDER BY a;
 } {1 2 3 2 3 4}
 
 # Insert two rows where the second conflicts on C.  The first row show go
 # and and then there should be a constraint error.
 #
-do_test conflict-7.3 {
+do_test 7.3 {
   catchsql {INSERT INTO t1(a,b,c) VALUES(4,5,6), (5,6,4);}
 } {1 {UNIQUE constraint failed: t1.c}}
-do_execsql_test conflict-7.4 {
+do_execsql_test 7.4 {
   SELECT a,b,c FROM t1 ORDER BY a;
 } {1 2 3 2 3 4 4 5 6}
 
 # Change which column is the PRIMARY KEY
 #
-do_execsql_test conflict-8.1 {
+do_execsql_test 8.1 {
   DROP TABLE t1;
   CREATE TABLE t1(
     a UNIQUE ON CONFLICT REPLACE, 
     b INT PRIMARY KEY ON CONFLICT IGNORE,
     c UNIQUE ON CONFLICT FAIL
@@ -245,28 +246,28 @@
   SELECT a,b,c FROM t1 ORDER BY a;
 } {1 2 3 2 3 4}
 
 # Insert a row that conflicts on column B.  The insert should be ignored.
 #
-do_execsql_test conflict-8.2 {
+do_execsql_test 8.2 {
   INSERT INTO t1(a,b,c) VALUES(3,2,5);
   SELECT a,b,c FROM t1 ORDER BY a;
 } {1 2 3 2 3 4}
 
 # Insert two rows where the second conflicts on C.  The first row show go
 # and and then there should be a constraint error.
 #
-do_test conflict-8.3 {
+do_test 8.3 {
   catchsql {INSERT INTO t1(a,b,c) VALUES(4,5,6), (5,6,4);}
 } {1 {UNIQUE constraint failed: t1.c}}
-do_execsql_test conflict-8.4 {
+do_execsql_test 8.4 {
   SELECT a,b,c FROM t1 ORDER BY a;
 } {1 2 3 2 3 4 4 5 6}
 
 # Change which column is the PRIMARY KEY
 #
-do_execsql_test conflict-9.1 {
+do_execsql_test 9.1 {
   DROP TABLE t1;
   CREATE TABLE t1(
     a UNIQUE ON CONFLICT REPLACE, 
     b INT PRIMARY KEY ON CONFLICT IGNORE,
     c UNIQUE ON CONFLICT FAIL
@@ -275,28 +276,28 @@
   SELECT a,b,c FROM t1 ORDER BY a;
 } {1 2 3 2 3 4}
 
 # Insert a row that conflicts on column B.  The insert should be ignored.
 #
-do_execsql_test conflict-9.2 {
+do_execsql_test 9.2 {
   INSERT INTO t1(a,b,c) VALUES(3,2,5);
   SELECT a,b,c FROM t1 ORDER BY a;
 } {1 2 3 2 3 4}
 
 # Insert two rows where the second conflicts on C.  The first row show go
 # and and then there should be a constraint error.
 #
-do_test conflict-9.3 {
+do_test 9.3 {
   catchsql {INSERT INTO t1(a,b,c) VALUES(4,5,6), (5,6,4);}
 } {1 {UNIQUE constraint failed: t1.c}}
-do_execsql_test conflict-9.4 {
+do_execsql_test 9.4 {
   SELECT a,b,c FROM t1 ORDER BY a;
 } {1 2 3 2 3 4 4 5 6}
 
 # Change which column is the PRIMARY KEY
 #
-do_execsql_test conflict-10.1 {
+do_execsql_test 10.1 {
   DROP TABLE t1;
   CREATE TABLE t1(
     a UNIQUE ON CONFLICT REPLACE, 
     b UNIQUE ON CONFLICT IGNORE,
     c INTEGER PRIMARY KEY ON CONFLICT FAIL
@@ -305,28 +306,28 @@
   SELECT a,b,c FROM t1 ORDER BY a;
 } {1 2 3 2 3 4}
 
 # Insert a row that conflicts on column B.  The insert should be ignored.
 #
-do_execsql_test conflict-10.2 {
+do_execsql_test 10.2 {
   INSERT INTO t1(a,b,c) VALUES(3,2,5);
   SELECT a,b,c FROM t1 ORDER BY a;
 } {1 2 3 2 3 4}
 
 # Insert two rows where the second conflicts on C.  The first row show go
 # and and then there should be a constraint error.
 #
-do_test conflict-10.3 {
+do_test 10.3 {
   catchsql {INSERT INTO t1(a,b,c) VALUES(4,5,6), (5,6,4);}
 } {1 {UNIQUE constraint failed: t1.c}}
-do_execsql_test conflict-10.4 {
+do_execsql_test 10.4 {
   SELECT a,b,c FROM t1 ORDER BY a;
 } {1 2 3 2 3 4 4 5 6}
 
 # Change which column is the PRIMARY KEY
 #
-do_execsql_test conflict-11.1 {
+do_execsql_test 11.1 {
   DROP TABLE t1;
   CREATE TABLE t1(
     a UNIQUE ON CONFLICT REPLACE, 
     b UNIQUE ON CONFLICT IGNORE,
     c PRIMARY KEY ON CONFLICT FAIL
@@ -335,22 +336,35 @@
   SELECT a,b,c FROM t1 ORDER BY a;
 } {1 2 3 2 3 4}
 
 # Insert a row that conflicts on column B.  The insert should be ignored.
 #
-do_execsql_test conflict-11.2 {
+do_execsql_test 11.2 {
   INSERT INTO t1(a,b,c) VALUES(3,2,5);
   SELECT a,b,c FROM t1 ORDER BY a;
 } {1 2 3 2 3 4}
 
 # Insert two rows where the second conflicts on C.  The first row show go
 # and and then there should be a constraint error.
 #
-do_test conflict-11.3 {
+do_test 11.3 {
   catchsql {INSERT INTO t1(a,b,c) VALUES(4,5,6), (5,6,4);}
 } {1 {UNIQUE constraint failed: t1.c}}
-do_execsql_test conflict-11.4 {
+do_execsql_test 11.4 {
   SELECT a,b,c FROM t1 ORDER BY a;
 } {1 2 3 2 3 4 4 5 6}
+
+# Check that ticket [f68dc596c4] has been fixed.
+#
+do_execsql_test 12.1 {
+  CREATE TABLE t2(a INTEGER PRIMARY KEY, b TEXT);
+  INSERT INTO t2 VALUES(111, '111');
+}
+do_execsql_test 12.2 {
+  REPLACE INTO t2 VALUES(NULL, '112'), (111, '111B');
+}
+do_execsql_test 12.3 {
+  SELECT * FROM t2;
+} {111 111B 112 112}
 
 
 finish_test