Merge trunk changes into the fts4-incr-merge branch.

FossilOrigin-Name: f61d5fb0281381228eb1a12a233bacaeb26b12a3
2012-03-20 17:04:17 +00:00
parent d1ab097d45 d878cab51a
commit e239233982
42 changed files with 318 additions and 172 deletions
@@ -482,6 +482,4 @@ foreach lid [list 4 [expr 1<<30]] {
    SELECT count(*) FROM t6_segments;
  } {4 4}
 }
-
-
 finish_test