summaryrefslogtreecommitdiff
path: root/lib/libsqlite3/ext/rtree
diff options
context:
space:
mode:
authorJames Turner <jturner@cvs.openbsd.org>2013-09-21 17:29:44 +0000
committerJames Turner <jturner@cvs.openbsd.org>2013-09-21 17:29:44 +0000
commitf4b2ec2ac9a647c58bac494d8543c2d8bfa55658 (patch)
tree5b2cccab47cd7f7e05b435f4019b0d1e279fcaf5 /lib/libsqlite3/ext/rtree
parentb6224b1725b2d2aff0c13c6dfad0c1e8af65eb81 (diff)
Update sqlite to 3.8.0.2. A list of changes are available here:
http://sqlite.org/changes.html. Tested in a bulk and ok landry@ ok espie@
Diffstat (limited to 'lib/libsqlite3/ext/rtree')
-rw-r--r--lib/libsqlite3/ext/rtree/rtree.c5
-rw-r--r--lib/libsqlite3/ext/rtree/rtree6.test20
-rw-r--r--lib/libsqlite3/ext/rtree/rtree8.test1
3 files changed, 14 insertions, 12 deletions
diff --git a/lib/libsqlite3/ext/rtree/rtree.c b/lib/libsqlite3/ext/rtree/rtree.c
index 16a316f400c..815a8993e4f 100644
--- a/lib/libsqlite3/ext/rtree/rtree.c
+++ b/lib/libsqlite3/ext/rtree/rtree.c
@@ -3350,7 +3350,10 @@ int sqlite3_rtree_geometry_callback(
}
#if !SQLITE_CORE
-int sqlite3_extension_init(
+#ifdef _WIN32
+__declspec(dllexport)
+#endif
+int sqlite3_rtree_init(
sqlite3 *db,
char **pzErrMsg,
const sqlite3_api_routines *pApi
diff --git a/lib/libsqlite3/ext/rtree/rtree6.test b/lib/libsqlite3/ext/rtree/rtree6.test
index 92edc8d104c..17985ee5256 100644
--- a/lib/libsqlite3/ext/rtree/rtree6.test
+++ b/lib/libsqlite3/ext/rtree/rtree6.test
@@ -74,36 +74,36 @@ do_test rtree6-1.5 {
do_eqp_test rtree6.2.1 {
SELECT * FROM t1,t2 WHERE k=+ii AND x1<10
} {
- 0 0 0 {SCAN TABLE t1 VIRTUAL TABLE INDEX 2:Ca (~0 rows)}
- 0 1 1 {SEARCH TABLE t2 USING INTEGER PRIMARY KEY (rowid=?) (~1 rows)}
+ 0 0 0 {SCAN TABLE t1 VIRTUAL TABLE INDEX 2:Ca}
+ 0 1 1 {SEARCH TABLE t2 USING INTEGER PRIMARY KEY (rowid=?)}
}
do_eqp_test rtree6.2.2 {
SELECT * FROM t1,t2 WHERE k=ii AND x1<10
} {
- 0 0 0 {SCAN TABLE t1 VIRTUAL TABLE INDEX 2:Ca (~0 rows)}
- 0 1 1 {SEARCH TABLE t2 USING INTEGER PRIMARY KEY (rowid=?) (~1 rows)}
+ 0 0 0 {SCAN TABLE t1 VIRTUAL TABLE INDEX 2:Ca}
+ 0 1 1 {SEARCH TABLE t2 USING INTEGER PRIMARY KEY (rowid=?)}
}
do_eqp_test rtree6.2.3 {
SELECT * FROM t1,t2 WHERE k=ii
} {
- 0 0 0 {SCAN TABLE t1 VIRTUAL TABLE INDEX 2: (~0 rows)}
- 0 1 1 {SEARCH TABLE t2 USING INTEGER PRIMARY KEY (rowid=?) (~1 rows)}
+ 0 0 0 {SCAN TABLE t1 VIRTUAL TABLE INDEX 2:}
+ 0 1 1 {SEARCH TABLE t2 USING INTEGER PRIMARY KEY (rowid=?)}
}
do_eqp_test rtree6.2.4 {
SELECT * FROM t1,t2 WHERE v=10 and x1<10 and x2>10
} {
- 0 0 0 {SCAN TABLE t1 VIRTUAL TABLE INDEX 2:CaEb (~0 rows)}
- 0 1 1 {SCAN TABLE t2 (~100000 rows)}
+ 0 0 0 {SCAN TABLE t1 VIRTUAL TABLE INDEX 2:CaEb}
+ 0 1 1 {SCAN TABLE t2}
}
do_eqp_test rtree6.2.5 {
SELECT * FROM t1,t2 WHERE k=ii AND x1<v
} {
- 0 0 0 {SCAN TABLE t1 VIRTUAL TABLE INDEX 2: (~0 rows)}
- 0 1 1 {SEARCH TABLE t2 USING INTEGER PRIMARY KEY (rowid=?) (~1 rows)}
+ 0 0 0 {SCAN TABLE t1 VIRTUAL TABLE INDEX 2:}
+ 0 1 1 {SEARCH TABLE t2 USING INTEGER PRIMARY KEY (rowid=?)}
}
do_execsql_test rtree6-3.1 {
diff --git a/lib/libsqlite3/ext/rtree/rtree8.test b/lib/libsqlite3/ext/rtree/rtree8.test
index bf22cbf4844..578a1468b8b 100644
--- a/lib/libsqlite3/ext/rtree/rtree8.test
+++ b/lib/libsqlite3/ext/rtree/rtree8.test
@@ -168,4 +168,3 @@ do_test rtree8-5.3 {
finish_test
-