1
0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-07 02:42:48 +03:00

Merge recent trunk changes into the begin-concurrent branch.

FossilOrigin-Name: acdafef836605ba2079966abde1fa40c43995b6a049d84f631e613605cabda3d
This commit is contained in:
drh
2021-03-03 19:17:25 +00:00
114 changed files with 6947 additions and 1456 deletions

View File

@@ -243,6 +243,7 @@ static int SQLITE_TCLAPI test_session_cmd(
{ "patchset", 0, "", }, /* 7 */
{ "diff", 2, "FROMDB TBL" }, /* 8 */
{ "fullchangeset",0, "" }, /* 9 */
{ "memory_used", 0, "", }, /* 9 */
{ 0 }
};
int iSub;
@@ -352,6 +353,12 @@ static int SQLITE_TCLAPI test_session_cmd(
}
break;
}
case 9: { /* memory_used */
sqlite3_int64 nMalloc = sqlite3session_memory_used(pSession);
Tcl_SetObjResult(interp, Tcl_NewWideIntObj(nMalloc));
break;
}
}
return TCL_OK;