Merge tag 'upstream/3.2.0'

Upstream version 3.2.0

# gpg: Signature made Thu 16 Oct 2014 10:51:39 PM EDT using RSA key ID 374BBE81
# gpg: Good signature from "Hans-Christoph Steiner <hans@guardianproject.info>"
# gpg:                 aka "Hans-Christoph Steiner <hans@eds.org>"
# gpg:                 aka "Hans-Christoph Steiner <hans@at.or.at>"
# gpg:                 aka "[jpeg image of size 5408]"

1 files changed, 8 insertions, 9 deletions

diff --git a/test/fts3query.test b/test/fts3query.test
index c8f8686..2d12351 100644
--- a/test/fts3query.test
+++ b/test/fts3query.test
@@ -118,26 +118,26 @@ do_test fts3query-4.1 {
 do_eqp_test fts3query-4.2 {
   SELECT t1.number FROM t1, ft WHERE t1.number=ft.rowid ORDER BY t1.date
 } {
-  0 0 0 {SCAN TABLE t1 USING COVERING INDEX i1 (~1000000 rows)} 
-  0 1 1 {SCAN TABLE ft VIRTUAL TABLE INDEX 1: (~0 rows)}
+  0 0 0 {SCAN TABLE t1 USING COVERING INDEX i1} 
+  0 1 1 {SCAN TABLE ft VIRTUAL TABLE INDEX 1:}
 }
 do_eqp_test fts3query-4.3 {
   SELECT t1.number FROM ft, t1 WHERE t1.number=ft.rowid ORDER BY t1.date
 } {
-  0 0 1 {SCAN TABLE t1 USING COVERING INDEX i1 (~1000000 rows)} 
-  0 1 0 {SCAN TABLE ft VIRTUAL TABLE INDEX 1: (~0 rows)}
+  0 0 1 {SCAN TABLE t1 USING COVERING INDEX i1} 
+  0 1 0 {SCAN TABLE ft VIRTUAL TABLE INDEX 1:}
 }
 do_eqp_test fts3query-4.4 {
   SELECT t1.number FROM t1, bt WHERE t1.number=bt.rowid ORDER BY t1.date
 } {
-  0 0 0 {SCAN TABLE t1 USING COVERING INDEX i1 (~1000000 rows)} 
-  0 1 1 {SEARCH TABLE bt USING INTEGER PRIMARY KEY (rowid=?) (~1 rows)}
+  0 0 0 {SCAN TABLE t1 USING COVERING INDEX i1} 
+  0 1 1 {SEARCH TABLE bt USING INTEGER PRIMARY KEY (rowid=?)}
 }
 do_eqp_test fts3query-4.5 {
   SELECT t1.number FROM bt, t1 WHERE t1.number=bt.rowid ORDER BY t1.date
 } {
-  0 0 1 {SCAN TABLE t1 USING COVERING INDEX i1 (~1000000 rows)} 
-  0 1 0 {SEARCH TABLE bt USING INTEGER PRIMARY KEY (rowid=?) (~1 rows)}
+  0 0 1 {SCAN TABLE t1 USING COVERING INDEX i1} 
+  0 1 0 {SEARCH TABLE bt USING INTEGER PRIMARY KEY (rowid=?)}
 }
 
 
@@ -210,4 +210,3 @@ do_select_tests 6.2 {
 
 
 finish_test
-