diff options
author | stephan <stephan@noemail.net> | 2025-03-19 10:14:46 +0000 |
---|---|---|
committer | stephan <stephan@noemail.net> | 2025-03-19 10:14:46 +0000 |
commit | 6e059d9daccc65e842b2488d136c790d4c704001 (patch) | |
tree | ce012e6f52388045af6db1cf549cb52a8f4dd528 /src/vdbeapi.c | |
parent | ff3c451428fb2cbadaa38acea1ef47c20368daf4 (diff) | |
parent | 8db881d0550f664fb4f32a088818553d5fef27e8 (diff) | |
download | sqlite-6e059d9daccc65e842b2488d136c790d4c704001.tar.gz sqlite-6e059d9daccc65e842b2488d136c790d4c704001.zip |
Merge trunk into the cygwin-fixes branch.
FossilOrigin-Name: 34eadd374b3c0a8c9e1f5f4a1c60fda8f16b1c56213b8c4047f96390c676b695
Diffstat (limited to 'src/vdbeapi.c')
-rw-r--r-- | src/vdbeapi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/vdbeapi.c b/src/vdbeapi.c index 31880d85b..523f80097 100644 --- a/src/vdbeapi.c +++ b/src/vdbeapi.c @@ -2216,7 +2216,7 @@ int sqlite3_preupdate_old(sqlite3 *db, int iIdx, sqlite3_value **ppValue){ if( !aRec ) goto preupdate_old_out; rc = sqlite3BtreePayload(p->pCsr->uc.pCursor, 0, nRec, aRec); if( rc==SQLITE_OK ){ - p->pUnpacked = vdbeUnpackRecord(&p->keyinfo, nRec, aRec); + p->pUnpacked = vdbeUnpackRecord(p->pKeyinfo, nRec, aRec); if( !p->pUnpacked ) rc = SQLITE_NOMEM; } if( rc!=SQLITE_OK ){ @@ -2281,7 +2281,7 @@ int sqlite3_preupdate_count(sqlite3 *db){ #else p = db->pPreUpdate; #endif - return (p ? p->keyinfo.nKeyField : 0); + return (p ? p->pKeyinfo->nKeyField : 0); } #endif /* SQLITE_ENABLE_PREUPDATE_HOOK */ @@ -2364,7 +2364,7 @@ int sqlite3_preupdate_new(sqlite3 *db, int iIdx, sqlite3_value **ppValue){ Mem *pData = &p->v->aMem[p->iNewReg]; rc = ExpandBlob(pData); if( rc!=SQLITE_OK ) goto preupdate_new_out; - pUnpack = vdbeUnpackRecord(&p->keyinfo, pData->n, pData->z); + pUnpack = vdbeUnpackRecord(p->pKeyinfo, pData->n, pData->z); if( !pUnpack ){ rc = SQLITE_NOMEM; goto preupdate_new_out; |