Merge branch '2.3' into 2.4

This commit is contained in:
Markus Mäkelä
2020-08-17 17:30:55 +03:00

View File

@ -122,7 +122,9 @@ Select *sqlite3SelectNew(
pNew = sqlite3DbMallocRawNN(db, sizeof(*pNew) ); pNew = sqlite3DbMallocRawNN(db, sizeof(*pNew) );
if( pNew==0 ){ if( pNew==0 ){
assert( db->mallocFailed ); assert( db->mallocFailed );
#ifndef MAXSCALE
pNew = &standin; pNew = &standin;
#endif
} }
if( pEList==0 ){ if( pEList==0 ){
#ifndef MAXSCALE #ifndef MAXSCALE