mirror of
https://github.com/sqlite/sqlite.git
synced 2025-08-08 14:02:16 +03:00
Merge the latest 3.44.0 release candidate patches into the bedrock branch.
FossilOrigin-Name: 956b03a4627ea2b9ab7596515aaf076a9895262d9ee23e5248c18d1a75f035a6
This commit is contained in:
@@ -611,8 +611,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;
|
||||
@@ -1274,7 +1276,7 @@ static int sessionReinitTable(sqlite3_session *pSession, SessionTable *pTab){
|
||||
}
|
||||
}
|
||||
|
||||
sqlite3_free(azCol);
|
||||
sqlite3_free((char*)azCol);
|
||||
return pSession->rc;
|
||||
}
|
||||
|
||||
@@ -5481,6 +5483,7 @@ static int sessionChangeMerge(
|
||||
){
|
||||
SessionChange *pNew = 0;
|
||||
int rc = SQLITE_OK;
|
||||
assert( aRec!=0 );
|
||||
|
||||
if( !pExist ){
|
||||
pNew = (SessionChange *)sqlite3_malloc64(sizeof(SessionChange) + nRec);
|
||||
|
Reference in New Issue
Block a user