Imported from /home/lorry/working-area/delta_berkeleydb/db-6.1.23.tar.gz.HEADdb-6.1.23master

1 files changed, 7 insertions, 4 deletions

diff --git a/lang/sql/sqlite/test/intpkey.test b/lang/sql/sqlite/test/intpkey.test
index 05b6cdf0..41858e5d 100644
--- a/lang/sql/sqlite/test/intpkey.test
+++ b/lang/sql/sqlite/test/intpkey.test
@@ -76,7 +76,7 @@ do_test intpkey-1.6 {
      INSERT INTO t1 VALUES(5,'second','entry');
   }} msg]
   lappend r $msg
-} {1 {PRIMARY KEY must be unique}}
+} {1 {UNIQUE constraint failed: t1.a}}
 do_test intpkey-1.7 {
   execsql {
     SELECT rowid, * FROM t1;
@@ -125,8 +125,11 @@ do_test intpkey-1.12.1 {
   }
 } {4 one two}
 do_test intpkey-1.12.2 {
-  set sqlite_query_plan
-} {t1 *}
+  execsql {
+    EXPLAIN QUERY PLAN
+    SELECT * FROM t1 WHERE a==4;
+  }
+} {/SEARCH TABLE t1 /}
 
 # Try to insert a non-integer value into the primary key field.  This
 # should result in a data type mismatch.
@@ -376,7 +379,7 @@ do_test intpkey-5.1 {
 } {0 zero entry 0}
 do_test intpkey-5.2 {
   execsql {
-    SELECT rowid, a FROM t1
+    SELECT rowid, a FROM t1 ORDER BY rowid
   }
 } {-4 -4 0 0 5 5 6 6 11 11}