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, 4 insertions, 4 deletions

diff --git a/test/tkt-385a5b56b9.test b/test/tkt-385a5b56b9.test
index 8184864..1338435 100644
--- a/test/tkt-385a5b56b9.test
+++ b/test/tkt-385a5b56b9.test
@@ -35,19 +35,19 @@ do_execsql_test 2.0 {
 }
 
 do_eqp_test 2.1 { SELECT DISTINCT x FROM t2 } {
-  0 0 0 {SCAN TABLE t2 USING COVERING INDEX t2x (~1000000 rows)}
+  0 0 0 {SCAN TABLE t2 USING COVERING INDEX t2x}
 }
 
 do_eqp_test 2.2 { SELECT DISTINCT y FROM t2 } {
-  0 0 0 {SCAN TABLE t2 USING COVERING INDEX t2y (~1000000 rows)}
+  0 0 0 {SCAN TABLE t2 USING COVERING INDEX t2y}
 }
 
 do_eqp_test 2.3 { SELECT DISTINCT x, y FROM t2 WHERE y=10 } {
-  0 0 0 {SEARCH TABLE t2 USING INDEX t2y (y=?) (~1 rows)}
+  0 0 0 {SEARCH TABLE t2 USING INDEX t2y (y=?)}
 }
 
 do_eqp_test 2.4 { SELECT DISTINCT x, y FROM t2 WHERE x=10 } {
-  0 0 0 {SEARCH TABLE t2 USING INDEX t2x (x=?) (~1 rows)}
+  0 0 0 {SEARCH TABLE t2 USING INDEX t2x (x=?)}
 }
 
 finish_test