Index: ext/fts2/fts2.c
==================================================================
--- ext/fts2/fts2.c
+++ ext/fts2/fts2.c
@@ -1372,14 +1372,20 @@
   dlrInit(&left, DL_DOCIDS, pLeft, nLeft);
   dlrInit(&right, DL_DOCIDS, pRight, nRight);
   dlwInit(&writer, DL_DOCIDS, pOut);
 
   while( !dlrAtEnd(&left) || !dlrAtEnd(&right) ){
-    if( dlrAtEnd(&right) || dlrDocid(&left)<dlrDocid(&right) ){
+    if( dlrAtEnd(&right) ){
+      dlwAdd(&writer, dlrDocid(&left));
+      dlrStep(&left);
+    }else if( dlrAtEnd(&left) ){
+      dlwAdd(&writer, dlrDocid(&right));
+      dlrStep(&right);
+    }else if( dlrDocid(&left)<dlrDocid(&right) ){
       dlwAdd(&writer, dlrDocid(&left));
       dlrStep(&left);
-    }else if( dlrAtEnd(&left) || dlrDocid(&right)<dlrDocid(&left) ){
+    }else if( dlrDocid(&right)<dlrDocid(&left) ){
       dlwAdd(&writer, dlrDocid(&right));
       dlrStep(&right);
     }else{
       dlwAdd(&writer, dlrDocid(&left));
       dlrStep(&left);

Index: test/fts2g.test
==================================================================
--- test/fts2g.test
+++ test/fts2g.test
@@ -5,11 +5,11 @@
 #*************************************************************************
 # This file implements regression tests for SQLite library.  The focus
 # of this script is testing handling of edge cases for various doclist
 # merging functions in the FTS2 module query logic.
 #
-# $Id: fts2g.test,v 1.1 2006/10/25 20:27:40 shess Exp $
+# $Id: fts2g.test,v 1.2 2007/04/19 18:36:32 shess Exp $
 #
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 
@@ -20,10 +20,11 @@
 }
 
 db eval {
   CREATE VIRTUAL TABLE t1 USING fts2(content);
   INSERT INTO t1 (rowid, content) VALUES(1, 'this is a test');
+  INSERT INTO t1 (rowid, content) VALUES(2, 'also a test');
 }
 
 # No hits at all.  Returns empty doclists from termSelect().
 do_test fts2g-1.1 {
   execsql {SELECT rowid FROM t1 WHERE t1 MATCH 'something'}
@@ -71,7 +72,16 @@
 
 # No support for all-except queries.
 do_test fts2g-1.10 {
   catchsql {SELECT rowid FROM t1 WHERE t1 MATCH '-this -something'}
 } {1 {SQL logic error or missing database}}
+
+# Test that docListOrMerge() correctly handles reaching the end of one
+# doclist before it reaches the end of the other.
+do_test fts2g-1.11 {
+  execsql {SELECT rowid FROM t1 WHERE t1 MATCH 'this OR also'}
+} {1 2}
+do_test fts2g-1.12 {
+  execsql {SELECT rowid FROM t1 WHERE t1 MATCH 'also OR this'}
+} {1 2}
 
 finish_test