From: drh <drh@noemail.net>
Date: Mon, 28 Apr 2014 17:51:12 +0000 (+0000)
Subject: Add the sqlite3_rtree_query_callback() API to the RTree virtual table.
X-Git-Tag: version-3.13.0~148^2~145
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ae28b301e10ea9f8fb56d50d25bb2112b3321285;p=thirdparty%2Fsqlite.git

Add the sqlite3_rtree_query_callback() API to the RTree virtual table.

FossilOrigin-Name: 3dca2809352c6c6d56db74447a814f77011c6220
---

ae28b301e10ea9f8fb56d50d25bb2112b3321285
diff --cc manifest
index 94ba8af65e,707f14a0a3..d92c7d7b7c
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\srecent\strunk\schanges\sinto\ssessions.
- D 2014-04-18T01:10:05.240
 -C Enhance\sthe\ssqlite3_rtree_query_info\sobject\sto\sreport\son\sthe\snumber\sof\s\nelements\sin\sthe\spriority\squeue\sat\seach\slevel.
 -D 2014-04-25T16:29:03.796
++C Add\sthe\ssqlite3_rtree_query_callback()\sAPI\sto\sthe\sRTree\svirtual\stable.
++D 2014-04-28T17:51:12.403
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in e4ee6d36cdf6136aee0158675a3b24dd3bf31a5a
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -284,7 -285,7 +285,7 @@@ F src/test_syscall.c 2e21ca7f7dc54a028f
  F src/test_tclvar.c f4dc67d5f780707210d6bb0eb6016a431c04c7fa
  F src/test_thread.c 1e133a40b50e9c035b00174035b846e7eef481cb
  F src/test_vfs.c e72f555ef7a59080f898fcf1a233deb9eb704ea9
--F src/test_vfstrace.c 3a0ab304682fecbceb689e7d9b904211fde11d78
++F src/test_vfstrace.c bab9594adc976cbe696ff3970728830b4c5ed698
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/tokenize.c 6da2de6e12218ccb0aea5184b56727d011f4bee7
  F src/trigger.c 66f3470b03b52b395e839155786966e3e037fddb
@@@ -1175,7 -1177,7 +1177,8 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
  F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
- P 9515c8344a6743bbb0c6a6e49fb79fb3139090df 2c5363873a6f990a0abaacac6303acd46b48befc
- R 6f10c61594cf9e1d36bddcd9a9abd40d
 -P eba95ead49f8f8ce45d400186562ff0066537c5c
 -R efef19137bd31aa6c6fdc7dea3b8daf2
++P 95e77efe076ab421bd246119c47dba5dacf9d087 f7dad408dd46a1e3612b6142a3afb1d0d4fcda00
++R dc0ef589b047e789a0dc76337788157a
++T +closed f7dad408dd46a1e3612b6142a3afb1d0d4fcda00
  U drh
- Z cbe658a5d5d955eb999ebf57e51622f9
 -Z ded30c2c8b9ed7281fad6af13254832e
++Z d1607abc9a994a369c35e1f132aa6989
diff --cc manifest.uuid
index 6da7ed206c,8909227722..ce5967cbb0
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 95e77efe076ab421bd246119c47dba5dacf9d087
 -f7dad408dd46a1e3612b6142a3afb1d0d4fcda00
++3dca2809352c6c6d56db74447a814f77011c6220
diff --cc src/test_vfstrace.c
index c1792f116e,c1792f116e..d0bc29f0c3
--- a/src/test_vfstrace.c
+++ b/src/test_vfstrace.c
@@@ -678,7 -678,7 +678,7 @@@ static int vfstraceAccess
    vfstrace_info *pInfo = (vfstrace_info*)pVfs->pAppData;
    sqlite3_vfs *pRoot = pInfo->pRootVfs;
    int rc;
--  vfstrace_printf(pInfo, "%s.xDelete(\"%s\",%d)",
++  vfstrace_printf(pInfo, "%s.xAccess(\"%s\",%d)",
                    pInfo->zVfsName, zPath, flags);
    rc = pRoot->xAccess(pRoot, zPath, flags, pResOut);
    vfstrace_print_errcode(pInfo, " -> %s", rc);