summaryrefslogtreecommitdiff
path: root/dist
diff options
context:
space:
mode:
authorJP Sugarbroad <jpsugar@google.com>2017-07-21 17:24:00 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-07-21 17:24:00 +0000
commit45b73a141dd020edb1ec331f9c48c56746b75b2e (patch)
tree5d6b1d0914ccd638f336ffe2a434950ecb3ef5fb /dist
parenta64b71c46819db344bf46b5db6c59f07dbdb3f31 (diff)
parent5a5ec9c6d96aa143b82ee93d71de84d0349a3020 (diff)
Revert "Tag FTS3 cursor pointers in fts3ColumnMethod()" am: 04b7193064 am: 8864d13b9c am: b8758ffc7f am: 23756c7fb0
am: 5a5ec9c6d9 Change-Id: I5df4d348e9eb33a71b2a4ed4d663e9abe6afaad5
Diffstat (limited to 'dist')
-rw-r--r--dist/sqlite3.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/dist/sqlite3.c b/dist/sqlite3.c
index 447d431..5dd9488 100644
--- a/dist/sqlite3.c
+++ b/dist/sqlite3.c
@@ -148588,7 +148588,6 @@ static int fts3ColumnMethod(
/* The extra column whose name is the same as the table.
** Return a blob which is a pointer to the cursor. */
sqlite3_result_blob(pCtx, &pCsr, sizeof(pCsr), SQLITE_TRANSIENT);
- sqlite3_result_subtype(pCtx, '3');
}else if( iCol==p->nColumn+2 && pCsr->pExpr ){
sqlite3_result_int64(pCtx, pCsr->iLangid);
}else{
@@ -148805,7 +148804,6 @@ static int fts3FunctionArg(
){
Fts3Cursor *pRet;
if( sqlite3_value_type(pVal)!=SQLITE_BLOB
- || sqlite3_value_subtype(pVal)!='3'
|| sqlite3_value_bytes(pVal)!=sizeof(Fts3Cursor *)
){
char *zErr = sqlite3_mprintf("illegal first argument to %s", zFunc);