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, 11 insertions, 0 deletions

diff --git a/test/lastinsert.test b/test/lastinsert.test
index adeb798..c5bc267 100644
--- a/test/lastinsert.test
+++ b/test/lastinsert.test
@@ -36,6 +36,17 @@ do_test lastinsert-1.1 {
     }
 } {0 3}
 
+# EVIDENCE-OF: R-47220-63683 The sqlite3_last_insert_rowid() function
+# does not work for WITHOUT ROWID tables.
+#
+do_test lastinsert-1.1w {
+    catchsql {
+        create table t1w (k integer primary key) WITHOUT ROWID;
+        insert into t1w values (123456);
+        select last_insert_rowid(); -- returns 3 from above.
+    }
+} {0 3}
+
 # LIRID unchanged after an update on a table
 do_test lastinsert-1.2 {
     catchsql {