database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-08 14:02:16 +03:00
Code Activity

Merge the latest trunk changes into the begin-concurrent branch.

Browse Source 
FossilOrigin-Name: 9fa405eb5aa786e7d7f5ee5a9ccf39adcc1dc25552da3a344c443367dc5881a3
This commit is contained in:
drh
2023-10-30 21:39:11 +00:00
parent 75e1099a72 23f5f62d41
commit 925d2e136a
45 changed files with 732 additions and 278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ext/session/sqlite3session.c
View File

@@ -610,8 +610,10 @@ static int sessionPreupdateHash(
** the type byte).
*/
static int sessionSerialLen(const u8 *a){
int e = *a;
int e;
int n;
assert( a!=0 );
e = *a;
if( e==0 || e==0xFF ) return 1;
if( e==SQLITE_NULL ) return 1;
if( e==SQLITE_INTEGER || e==SQLITE_FLOAT ) return 9;
@@ -1273,7 +1275,7 @@ static int sessionReinitTable(sqlite3_session *pSession, SessionTable *pTab){
}
}
sqlite3_free(azCol);
sqlite3_free((char*)azCol);
return pSession->rc;
}
@@ -5471,6 +5473,7 @@ static int sessionChangeMerge(
){
SessionChange *pNew = 0;
int rc = SQLITE_OK;
assert( aRec!=0 );
if( !pExist ){
pNew = (SessionChange *)sqlite3_malloc64(sizeof(SessionChange) + nRec);