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

1 files changed, 7 insertions, 3 deletions

diff --git a/lang/sql/sqlite/test/misc3.test b/lang/sql/sqlite/test/misc3.test
index 94a43c43..bc1f0ff9 100644
--- a/lang/sql/sqlite/test/misc3.test
+++ b/lang/sql/sqlite/test/misc3.test
@@ -270,7 +270,11 @@ ifcapable {explain} {
       CREATE UNIQUE INDEX ex1i1 ON ex1(a);
       EXPLAIN REINDEX;
     }]
-    regexp { IsUnique \d+ \d+ \d+ \d+ } $x
+    ifcapable mergesort {
+      regexp { SorterCompare \d+ \d+ \d+ } $x
+    } else {
+      regexp { IsUnique \d+ \d+ \d+ \d+ } $x
+    }
   } {1}
   if {[regexp {16} [db one {PRAGMA encoding}]]} {
     do_test misc3-6.11-utf16 {
@@ -279,7 +283,7 @@ ifcapable {explain} {
       }]
       set y [regexp { 123456789012 } $x]
       lappend y [regexp { 4.5678 } $x]
-      lappend y [regexp {,-BINARY} $x]
+      lappend y [regexp {,-B} $x]
     } {1 1 1}
   } else {
     do_test misc3-6.11-utf8 {
@@ -289,7 +293,7 @@ ifcapable {explain} {
       set y [regexp { 123456789012 } $x]
       lappend y [regexp { 4.5678 } $x]
       lappend y [regexp { hello } $x]
-      lappend y [regexp {,-BINARY} $x]
+      lappend y [regexp {,-B} $x]
     } {1 1 1 1}
   }
 }