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

diff --git a/test/loadext2.test b/test/loadext2.test
index 3d01539..d5b6ea8 100644
--- a/test/loadext2.test
+++ b/test/loadext2.test
@@ -43,6 +43,19 @@ do_test loadext2-1.2 {
   }
 } {1 {no such function: cube}}
 
+# Extensions loaders not currently registered
+#
+do_test loadext2-1.2.1 {
+  sqlite3_cancel_auto_extension_sqr
+} {0}
+do_test loadext2-1.2.2 {
+  sqlite3_cancel_auto_extension_sqr
+} {0}
+do_test loadext2-1.2.3 {
+  sqlite3_cancel_auto_extension_sqr
+} {0}
+
+
 # Register auto-loaders.  Still functions do not exist.
 #
 do_test loadext2-1.3 {
@@ -76,8 +89,19 @@ do_test loadext2-1.6 {
 
 # Reset extension auto loading.  Existing extensions still exist.
 #
-do_test loadext2-1.7 {
-  sqlite3_reset_auto_extension
+do_test loadext2-1.7.1 {
+  sqlite3_cancel_auto_extension_sqr
+} {1}
+do_test loadext2-1.7.2 {
+  sqlite3_cancel_auto_extension_sqr
+} {0}
+do_test loadext2-1.7.3 {
+  sqlite3_cancel_auto_extension_cube
+} {1}
+do_test loadext2-1.7.4 {
+  sqlite3_cancel_auto_extension_cube
+} {0}
+do_test loadext2-1.7.5 {
   catchsql {
     SELECT sqr(2)
   }