database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-14 00:22:38 +03:00
Code Activity

Fixes to the MEM changes. The library now links. (CVS 1470)

Browse Source 
FossilOrigin-Name: f33d15d95f195e26e1ef396158597a2caa06f374
This commit is contained in:
drh
2004-05-27 03:12:53 +00:00
parent eb2e176a12
commit f44795013f
11 changed files with 210 additions and 287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/vdbeaux.c
View File

@@ -571,7 +571,7 @@ int sqlite3VdbeList(
Op *pOp = &p->aOp[i];
Mem *pMem = p->aStack;
pMem->flags = MEM_Int;
pMem->type = SQLITE3_INT;
pMem->type = SQLITE3_INTEGER;
pMem->i = i; /* Program counter */
pMem++;
@@ -584,17 +584,17 @@ int sqlite3VdbeList(
pMem->flags = MEM_Int;
pMem->i = pOp->p1; /* P1 */
pMem->type = SQLITE3_INT;
pMem->type = SQLITE3_INTEGER;
pMem++;
pMem->flags = MEM_Int;
pMem->i = pOp->p2; /* P2 */
pMem->type = SQLITE_INT;
pMem->type = SQLITE3_INTEGER;
pMem++;
pMem->flags = MEM_Short|MEM_Str|MEM_Term; /* P3 */
pMem->z = displayP3(pOp, pMem->zShort, sizeof(pMem->zShort));
pMem->type = SQLITE_TEXT;
pMem->type = SQLITE3_TEXT;
pMem->enc = TEXT_Utf8;
p->nResColumn = 5;
@@ -886,9 +886,9 @@ int sqlite3VdbeSetColName(Vdbe *p, int idx, const char *zName, int N){
pColName = &(p->aColName[idx]);
if( N==0 ){
rc = MemSetStr(pColName, zName, -1, TEXT_Utf8, 1);
rc = sqlite3VdbeMemSetStr(pColName, zName, -1, TEXT_Utf8, 1);
}else{
rc = MemSetStr(pColName, zName, N, TEXT_Utf8, N>0);
rc = sqlite3VdbeMemSetStr(pColName, zName, N, TEXT_Utf8, N>0);
}
if( rc==SQLITE_OK && N==P3_DYNAMIC ){
pColName->flags = (pColName->flags&(~MEM_Static))|MEM_Dyn;