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

diff --git a/test/where4.test b/test/where4.test
index 280eb5f..a26e9ad 100644
--- a/test/where4.test
+++ b/test/where4.test
@@ -71,7 +71,7 @@ do_test where4-1.5 {
 } {1 2}
 do_test where4-1.6 {
   count {SELECT rowid FROM t1 WHERE w=1 AND x<9}
-} {1 3}
+} {1 2}
 do_test where4-1.7 {
   count {SELECT rowid FROM t1 WHERE w=1 AND x IS NULL AND y=3}
 } {2 2}
@@ -98,7 +98,7 @@ do_test where4-1.14 {
 } {7 2}
 do_test where4-1.15 {
   count {SELECT rowid FROM t1 WHERE w IS NULL AND x IS NULL AND y<0}
-} {2}
+} {1}
 do_test where4-1.16 {
   count {SELECT rowid FROM t1 WHERE w IS NULL AND x IS NULL AND y>=0}
 } {1}